From: frohlich <frohlich>
Date: Fri, 2 Feb 2007 18:16:42 +0000 (+0000)
Subject: Modified Files:
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=4d91bc5908f719743ffd7a9881fefc82427e4c2b;p=simgear.git

Modified Files:
	ephemeris.cxx ephemeris.hxx stardata.cxx:
	one must not do changes just before checkin,
	one most not do changes just before checkin,
	[ last message repeated 100 times ]
---

diff --git a/simgear/ephemeris/ephemeris.cxx b/simgear/ephemeris/ephemeris.cxx
index 3c4c54f9..a05481bd 100644
--- a/simgear/ephemeris/ephemeris.cxx
+++ b/simgear/ephemeris/ephemeris.cxx
@@ -31,7 +31,7 @@
 
 
 // Constructor
-SGEphemeris::SGEphemeris( const string &path ) {
+SGEphemeris::SGEphemeris( const std::string &path ) {
     our_sun = new Star;
     moon = new MoonPos;
     mercury = new Mercury;
diff --git a/simgear/ephemeris/ephemeris.hxx b/simgear/ephemeris/ephemeris.hxx
index d46650fb..e5579bdb 100644
--- a/simgear/ephemeris/ephemeris.hxx
+++ b/simgear/ephemeris/ephemeris.hxx
@@ -29,6 +29,7 @@
 #ifndef _EPHEMERIS_HXX
 #define _EPHEMERIS_HXX
 
+#include <string>
 
 #include <simgear/ephemeris/star.hxx>
 #include <simgear/ephemeris/moonpos.hxx>
@@ -42,6 +43,7 @@
 #include <simgear/ephemeris/stardata.hxx>
 
 #include <simgear/math/SGMath.hxx>
+#include <simgear/misc/sg_path.hxx>
 
 
 /** Ephemeris class
@@ -95,7 +97,7 @@ public:
      * calling the constructor you need to provide a path pointing to
      * your star database file.
      * @param path path to your star database */
-    SGEphemeris( const string &path );
+    SGEphemeris( const std::string &path );
 
     /** Destructor */
     ~SGEphemeris( void );
diff --git a/simgear/ephemeris/stardata.cxx b/simgear/ephemeris/stardata.cxx
index 0be37865..bba1a536 100644
--- a/simgear/ephemeris/stardata.cxx
+++ b/simgear/ephemeris/stardata.cxx
@@ -51,13 +51,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;
     }