Changeset 380 for trunk/src/gl/gl_device.cc

Timestamp:

05/29/15 17:28:16 (10 years ago)

Author:

epyon

Message:

• oops, missed src : got rid of to_string and other std::string utilities (except slurp) string no longer in nv namespace

File:

• trunk/src/gl/gl_device.cc (modified) (5 diffs)

trunk/src/gl/gl_device.cc

@@ -217 +217 @@
 }
 
-uniform_base* nv::gl_device::get_uniform( program p, const string& name, bool fatal /*= true */ ) const
+uniform_base* nv::gl_device::get_uniform( program p, const std::string& name, bool fatal /*= true */ ) const
 {
         const gl_program_info* info = m_programs.get( p );
@@ -235 +235 @@
 }
 
-int nv::gl_device::get_attribute_location( program p, const string& name, bool fatal /*= true */ ) const
+int nv::gl_device::get_attribute_location( program p, const std::string& name, bool fatal /*= true */ ) const
 {
         const gl_program_info* info = m_programs.get( p );
@@ -347 +347 @@
                 glGetActiveAttrib( p->glid, i, 128, &attr_nlen, &attr_len, &attr_type, name_buffer );
 
-                string name( name_buffer, size_t(attr_nlen) );
+                std::string name( name_buffer, size_t( attr_nlen ) );
 
                 // skip built-ins
@@ -376 +376 @@
                 glGetActiveUniform( p->glid, i, 128, &uni_nlen, &uni_len, &uni_type, name_buffer );
 
-                string name( name_buffer, size_t(uni_nlen) );
+                std::string name( name_buffer, size_t( uni_nlen ) );
 
                 // skip built-ins
@@ -385 +385 @@
 
                 // check for array
-                string::size_type arrchar = name.find('[');
-                if ( arrchar != string::npos )
+                std::string::size_type arrchar = name.find( '[' );
+                if ( arrchar != std::string::npos )
                 {
                         name = name.substr( 0, arrchar );