Changeset 256 for trunk/src/library.cc

Timestamp:

06/14/14 21:06:00 (11 years ago)

Author:

epyon

Message:

• various minor fixes

File:

• trunk/src/library.cc (modified) (9 diffs)

trunk/src/library.cc

@@ -4 +4 @@
 #include "nv/common.hh"
 #include "nv/library.hh"
-
-#include <string.h>
 
 #if NV_PLATFORM == NV_WINDOWS
@@ -41 +39 @@
 }
 
-void library::open( const std::string& name )
+void library::open( const string& name )
 {
         m_name = name;
@@ -51 +49 @@
 }
 
-bool nv::library::try_open( const std::string& name )
+bool nv::library::try_open( const string& name )
 {
         m_name = name;
@@ -62 +60 @@
 }
 
-const std::string& library::get_name() const
+const string& library::get_name() const
 {
     return m_name;
@@ -75 +73 @@
     NV_LOG( LOG_NOTICE, "library : loading '" + m_name + "'..." );
 
-    std::string name = m_name;
-    std::string ext  = NV_LIB_EXT;
+    string name = m_name;
+    string ext  = NV_LIB_EXT;
     size_t ext_len   = ext.length();
 
@@ -95 +93 @@
 }
 
-void* library::get( const std::string& symbol )
+void* library::get( const string& symbol )
 {
         void* result = (void*) NV_LIB_GET( (NV_LIB_HANDLE) m_handle, symbol.c_str() );
@@ -105 +103 @@
 }
 
-void* nv::library::try_get( const std::string& symbol )
+void* nv::library::try_get( const string& symbol )
 {
         return (void*) NV_LIB_GET( (NV_LIB_HANDLE) m_handle, symbol.c_str() );
@@ -133 +131 @@
 }
 
-std::string library::get_error()
+string library::get_error()
 {
 #if NV_PLATFORM == NV_WINDOWS
@@ -140 +138 @@
     FormatMessage( FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS,
         NULL, GetLastError(), MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), (LPTSTR) &buffer, 0, NULL );
-    std::string msg( (char*)buffer );
+    string msg( (char*)buffer );
     LocalFree( buffer );
     return msg;
 #elif NV_PLATFORM == NV_LINUX || NV_PLATFORM == NV_APPLE
-    return std::string(dlerror());
+    return string(dlerror());
 #else
-    return std::string("");
+    return string("");
 #endif
 }