Partial OSX support

[xonotic/netradiant.git] / plugins / vfspk3 / vfs.cpp

diff --git a/plugins/vfspk3/vfs.cpp b/plugins/vfspk3/vfs.cpp
index 4ccc8b59d4e7f30b280a08ac978641fa48ff184f..b952f8ff476725c9247f9565be24e0af3c9b70e1 100644 (file)
--- a/plugins/vfspk3/vfs.cpp
+++ b/plugins/vfspk3/vfs.cpp
@@ -44,7 +44,7 @@
 #include "vfs.h"
 
 #include <stdio.h>
-#include <stdlib.h>
+#include <cstdlib>
 #include <glib.h>
 
 #include "qerplugin.h"
@@ -78,7 +78,7 @@ Archive* OpenArchive( const char* name );
 
 struct archive_entry_t
 {
-       CopiedString name;
+       std::string name;
        Archive* archive;
        bool is_pakfile;
 };
@@ -269,12 +269,12 @@ static int string_compare_nocase_upper( const char* a, const char* b ){
 class PakLess
 {
 public:
-bool operator()( const CopiedString& self, const CopiedString& other ) const {
+bool operator()( const std::string& self, const std::string& other ) const {
        return string_compare_nocase_upper( self.c_str(), other.c_str() ) > 0;
 }
 };
 
-typedef std::set<CopiedString, PakLess> Archives;
+typedef std::set<std::string, PakLess> Archives;
 
 // =============================================================================
 // Global functions