Changeset 433 for trunk/src/core/library.cc

Timestamp:

07/21/15 19:40:00 (10 years ago)

Author:

epyon

Message:

• string.hh split into separate files
• string.hh - removed std::string conversions (header still stays though)

File:

• trunk/src/core/library.cc (modified) (5 diffs)

trunk/src/core/library.cc

@@ -62 +62 @@
 string_view library::get_name() const
 {
-    return string_view( m_name );
+    return string_view( m_name.c_str(), m_name.size() );
 }
 
@@ -71 +71 @@
         return true;
     }
-    NV_LOG_NOTICE( "library \"", string_view( m_name ), "\" : loading..." );
+    NV_LOG_NOTICE( "library \"", string_view( m_name.c_str(), m_name.size() ), "\" : loading..." );
 
         std::string name = m_name;
-        string_view ext( NV_LIB_EXT );
+        std::string ext( NV_LIB_EXT );
 
         if ( name.length() < ext.length() || name.substr( name.length() - ext.length(), ext.length() ) != ext )
@@ -85 +85 @@
     if ( m_handle == NULL )
     {
-                NV_LOG_NOTICE( "library \"", string_view( name ), "\" : failed to open!" );
+                NV_LOG_NOTICE( "library \"", string_view( m_name.c_str(), m_name.size() ), "\" : failed to open!" );
                 return false;
     }
-    NV_LOG_NOTICE( "library \"", string_view( name ), "\" : loaded." );
+    NV_LOG_NOTICE( "library \"", string_view( m_name.c_str(), m_name.size() ), "\" : loaded." );
         return true;
 }
@@ -97 +97 @@
     if ( !result )
     {
-                NV_LOG_CRITICAL( "library \"", string_view( m_name ), "\" : can't find symbol \"", symbol, "\"" );
+                NV_LOG_CRITICAL( "library \"", string_view( m_name.c_str(), m_name.size() ), "\" : can't find symbol \"", symbol, "\"" );
                 NV_ABORT( "Library symbol load failed!" );
     }
@@ -117 +117 @@
     if ( ! NV_LIB_CLOSE( m_handle ) )
     {
-        NV_LOG_ERROR( "library \"", string_view( m_name ), "\" : can't close library!" );
+        NV_LOG_ERROR( "library \"", string_view( m_name.c_str(), m_name.size() ), "\" : can't close library!" );
     }
     m_handle = nullptr;