use std::string

diff --git a/simgear/io/decode_binobj.cxx b/simgear/io/decode_binobj.cxx
index 302648bda8f67c5668483d5368d1918a5bcf710d..8560a855fb6623f08957a76736862d0888746301 100644 (file)
--- a/simgear/io/decode_binobj.cxx
+++ b/simgear/io/decode_binobj.cxx
@@ -63,7 +63,7 @@ int main( int argc, char **argv ) {
     cout << "# geometry groups" << endl;
     cout << endl;
 
-    string material;
+    std::string material;
     int_list vertex_index;
     int_list normal_index;
     int_list tex_index;

diff --git a/simgear/io/sg_binobj.hxx b/simgear/io/sg_binobj.hxx
index 13a826bc7b42ee0d38fc0e766c79078bea9cca40..83194725e396c37b08b30123c7fdfdfc4f77a301 100644 (file)
--- a/simgear/io/sg_binobj.hxx
+++ b/simgear/io/sg_binobj.hxx
@@ -196,7 +196,7 @@ public:
      * @param file input file name
      * @return result of read
      */
-    bool read_bin( const string& file );
+    bool read_bin( const std::string& file );
 
     /** 
      * Write out the structures to a binary file.  We assume that the
@@ -207,7 +207,7 @@ public:
      * @param b bucket for object location
      * @return result of write
      */
-    bool write_bin( const string& base, const string& name, const SGBucket& b );
+    bool write_bin( const std::string& base, const std::string& name, const SGBucket& b );
 
     /**
      * Write out the structures to an ASCII file.  We assume that the
@@ -218,7 +218,7 @@ public:
      * @param b bucket for object location
      * @return result of write
      */
-    bool write_ascii( const string& base, const string& name,
+    bool write_ascii( const std::string& base, const std::string& name,
                      const SGBucket& b );
 };