Index: trunk/src/gl/gl_device.cc
===================================================================
--- trunk/src/gl/gl_device.cc	(revision 376)
+++ trunk/src/gl/gl_device.cc	(revision 380)
@@ -217,5 +217,5 @@
 }
 
-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,5 +235,5 @@
 }
 
-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,5 +347,5 @@
 		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,5 +376,5 @@
 		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,6 +385,6 @@
 
 		// 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 );