X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=libs%2Fstringio.h;h=85d598f34f4e85da28b6a1670c080ff15cd0e66e;hb=refs%2Fheads%2FMelanosuchus%2Fcmake;hp=8af056e6fc514726a818d77c8065cf5f7d227890;hpb=003a415b7a70f3791d4bcabde45d8de4e25a8aeb;p=xonotic%2Fnetradiant.git

diff --git a/libs/stringio.h b/libs/stringio.h
index 8af056e6..85d598f3 100644
--- a/libs/stringio.h
+++ b/libs/stringio.h
@@ -22,7 +22,7 @@
 #if !defined ( INCLUDED_STRINGIO_H )
 #define INCLUDED_STRINGIO_H
 
-#include <stdlib.h>
+#include <cstdlib>
 #include <cctype>
 
 #include "generic/vector.h"
@@ -289,14 +289,14 @@ inline TextOutputStreamType& ostream_write( TextOutputStreamType& outputStream,
 
 
 
-inline void CopiedString_importString( CopiedString& self, const char* string ){
+inline void CopiedString_importString( std::string& self, const char* string ){
 	self = string;
 }
-typedef ReferenceCaller1<CopiedString, const char*, CopiedString_importString> CopiedStringImportStringCaller;
-inline void CopiedString_exportString( const CopiedString& self, const StringImportCallback& importer ){
+typedef ReferenceCaller1<std::string, const char*, CopiedString_importString> CopiedStringImportStringCaller;
+inline void CopiedString_exportString( const std::string& self, const StringImportCallback& importer ){
 	importer( self.c_str() );
 }
-typedef ConstReferenceCaller1<CopiedString, const StringImportCallback&, CopiedString_exportString> CopiedStringExportStringCaller;
+typedef ConstReferenceCaller1<std::string, const StringImportCallback&, CopiedString_exportString> CopiedStringExportStringCaller;
 
 inline void Bool_importString( bool& self, const char* string ){
 	self = string_equal( string, "true" );