Index: trunk/src/gl/gl_device.cc
===================================================================
--- trunk/src/gl/gl_device.cc	(revision 433)
+++ trunk/src/gl/gl_device.cc	(revision 438)
@@ -17,9 +17,9 @@
 gl_device::gl_device()
 {
-	m_shader_header  = "#version 120\n";
+	m_shader_header.append( "#version 120\n" );
 	for ( auto& i : get_uniform_factory() ) 
-		m_shader_header += "uniform "+datatype_to_glsl_type( i.second->get_datatype() )+" "+ std::string( i.first.data(), i.first.size() ) +";\n";
+		m_shader_header.append( "uniform "+datatype_to_glsl_type( i.second->get_datatype() )+" "+ i.first +";\n" );
 	for ( auto& i : get_link_uniform_factory() ) 
-		m_shader_header += "uniform sampler2D "+std::string( i.first.data(), i.first.size() ) +";\n";
+		m_shader_header.append( "uniform sampler2D "+i.first +";\n" );
 }
 
Index: trunk/src/gl/gl_enum.cc
===================================================================
--- trunk/src/gl/gl_enum.cc	(revision 433)
+++ trunk/src/gl/gl_enum.cc	(revision 438)
@@ -354,5 +354,5 @@
 }
 
-std::string nv::datatype_to_glsl_type( datatype type )
+string_view nv::datatype_to_glsl_type( datatype type )
 {
 	switch( type )