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

Timestamp:

07/23/15 17:29:49 (10 years ago)

Author:

epyon

Message:

• massive amount of std::string removal
• removed slurp, use filesystem::slurp instead
• lua_values const_string support
• several bugfixes
• program_manager and shader loading without std::string/std::stream

File:

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

trunk/src/core/library.cc

@@ -6 +6 @@
 
 #include "nv/core/library.hh"
-#include <string>
 
 #if NV_PLATFORM == NV_WINDOWS
@@ -74 +73 @@
     NV_LOG_NOTICE( "library \"", m_name, "\" : loading..." );
 
-        std::string name( m_name.data(), m_name.length() );
-        std::string ext( NV_LIB_EXT );
+        string128 name( m_name );
+        string_view ext( NV_LIB_EXT );
 
-        if ( name.length() < ext.length() || name.substr( name.length() - ext.length(), ext.length() ) != ext )
+        if ( name.length() < ext.length() || !name.ends_with( ext ) )
     {
-        name.append( ext.data(), ext.length() );
+        name.append( ext );
     }
 
-    m_handle = NV_LIB_OPEN( name.c_str() );
+    m_handle = NV_LIB_OPEN( name.data() );
 
     if ( m_handle == NULL )
     {
-                NV_LOG_NOTICE( "library \"", m_name, "\" : failed to open!" );
+                NV_LOG_NOTICE( "library \"", name, "\" : failed to open!" );
                 return false;
     }