Linux test_HTTP fixes.

[simgear.git] / simgear / ephemeris / stardata.cxx

diff --git a/simgear/ephemeris/stardata.cxx b/simgear/ephemeris/stardata.cxx
index 0be378654c6dce1964614c76ed70ff97fa1b1591..a78583338b95ca34d819c7c8ba05dd6dfb412aaa 100644 (file)
--- a/simgear/ephemeris/stardata.cxx
+++ b/simgear/ephemeris/stardata.cxx
@@ -31,9 +31,11 @@
 #include "stardata.hxx"
 
 #if defined (_MSC_VER)
-  SG_USING_STD(getline);
+  using std::getline;
 #endif
 
+using std::string;
+
 // Constructor
 SGStarData::SGStarData( const SGPath& path )
 {
@@ -51,13 +53,14 @@ bool SGStarData::load( const SGPath& path ) {
     _stars.clear();
 
     // build the full path name to the stars data base file
-    path.append( "stars" );
-    SG_LOG( SG_ASTRO, SG_INFO, "  Loading stars from " << path.str() );
+    SGPath tmp = path;
+    tmp.append( "stars" );
+    SG_LOG( SG_ASTRO, SG_INFO, "  Loading stars from " << tmp.str() );
 
-    sg_gzifstream in( path.str() );
+    sg_gzifstream in( tmp.str() );
     if ( ! in.is_open() ) {
        SG_LOG( SG_ASTRO, SG_ALERT, "Cannot open star file: "
-               << path.str() );
+               << tmp.str() );
         return false;
     }