A bit of file renaming to avoid problems with MSVC++

simgear/ephemeris/Makefile.am

@@ -8,11 +8,11 @@ include_HEADERS = \
 	jupiter.hxx \
 	mars.hxx \
 	mercury.hxx \
-	moon.hxx \
+	moonpos.hxx \
 	neptune.hxx \
 	saturn.hxx \
 	star.hxx \
-	stars.hxx \
+	stardata.hxx \
 	uranus.hxx \
 	venus.hxx
 
@@ -22,12 +22,12 @@ libsgephem_a_SOURCES = \
 	jupiter.cxx \
 	mars.cxx \
 	mercury.cxx \
-	moon.cxx \
+	moonpos.cxx \
 	neptune.cxx \
 	pluto.hxx \
 	saturn.cxx \
 	star.cxx \
-	stars.cxx \
+	stardata.cxx \
 	uranus.cxx \
 	venus.cxx
 

simgear/ephemeris/ephemeris.cxx

@@ -29,7 +29,7 @@
 // Constructor
 SGEphemeris::SGEphemeris( const string &path ) {
     our_sun = new Star;
-    moon = new Moon;
+    moon = new MoonPos;
     mercury = new Mercury;
     venus = new Venus;
     mars = new Mars;

simgear/ephemeris/ephemeris.hxx

@@ -37,7 +37,7 @@
 #include <plib/sg.h>
 
 #include <simgear/ephemeris/star.hxx>
-#include <simgear/ephemeris/moon.hxx>
+#include <simgear/ephemeris/moonpos.hxx>
 #include <simgear/ephemeris/mercury.hxx>
 #include <simgear/ephemeris/venus.hxx>
 #include <simgear/ephemeris/mars.hxx>
@@ -45,13 +45,13 @@
 #include <simgear/ephemeris/saturn.hxx>
 #include <simgear/ephemeris/uranus.hxx>
 #include <simgear/ephemeris/neptune.hxx>
-#include <simgear/ephemeris/stars.hxx>
+#include <simgear/ephemeris/stardata.hxx>
 
 
 class SGEphemeris {
 
     Star *our_sun;
-    Moon *moon;
+    MoonPos *moon;
     Mercury *mercury;
     Venus *venus;
     Mars *mars;
@@ -91,7 +91,7 @@ public:
     }
 
     // moon
-    inline Moon *get_moon() const { return moon; }
+    inline MoonPos *get_moon() const { return moon; }
     inline double getMoonRightAscension() const {
 	return moon->getRightAscension();
     }

simgear/ephemeris/moonpos.cxx

@@ -1,5 +1,5 @@
 /**************************************************************************
- * moon.cxx
+ * moonpos.cxx
  * Written by Durk Talsma. Originally started October 1997, for distribution  
  * with the FlightGear project. Version 2 was written in August and 
  * September 1998. This code is based upon algorithms and data kindly 
@@ -36,18 +36,18 @@
 
 // #include <FDM/flight.hxx>
 
-#include "moon.hxx"
+#include "moonpos.hxx"
 
 
 /*************************************************************************
- * Moon::Moon(double mjd)
- * Public constructor for class Moon. Initializes the orbital elements and 
+ * MoonPos::MoonPos(double mjd)
+ * Public constructor for class MoonPos. Initializes the orbital elements and 
  * sets up the moon texture.
  * Argument: The current time.
- * the hard coded orbital elements for Moon are passed to 
+ * the hard coded orbital elements for MoonPos are passed to 
  * CelestialBody::CelestialBody();
  ************************************************************************/
-Moon::Moon(double mjd) :
+MoonPos::MoonPos(double mjd) :
   CelestialBody(125.1228, -0.0529538083,
 		5.1454,    0.00000,
 		318.0634,  0.1643573223,
@@ -57,7 +57,7 @@ Moon::Moon(double mjd) :
 {
 }
 
-Moon::Moon() :
+MoonPos::MoonPos() :
   CelestialBody(125.1228, -0.0529538083,
 		5.1454,    0.00000,
 		318.0634,  0.1643573223,
@@ -68,18 +68,18 @@ Moon::Moon() :
 }
 
 
-Moon::~Moon()
+MoonPos::~MoonPos()
 {
 }
 
 
 /*****************************************************************************
- * void Moon::updatePosition(double mjd, Star *ourSun)
+ * void MoonPos::updatePosition(double mjd, Star *ourSun)
  * this member function calculates the actual topocentric position (i.e.) 
  * the position of the moon as seen from the current position on the surface
  * of the moon. 
  ****************************************************************************/
-void Moon::updatePosition(double mjd, double lst, double lat, Star *ourSun)
+void MoonPos::updatePosition(double mjd, double lst, double lat, Star *ourSun)
 {
   double 
     eccAnom, ecl, actTime,

simgear/ephemeris/moonpos.hxx

@@ -1,5 +1,5 @@
 /**************************************************************************
- * moon.hxx
+ * moonpos.hxx
  * Written by Durk Talsma. Originally started October 1997, for distribution  
  * with the FlightGear project. Version 2 was written in August and 
  * September 1998. This code is based upon algorithms and data kindly 
@@ -22,8 +22,8 @@
  *
  * $Id$
  **************************************************************************/
-#ifndef _MOON_HXX_
-#define _MOON_HXX_
+#ifndef _MOONPOS_HXX_
+#define _MOONPOS_HXX_
 
 
 #include <simgear/constants.h>
@@ -31,7 +31,8 @@
 #include <simgear/ephemeris/celestialBody.hxx>
 #include <simgear/ephemeris/star.hxx>
 
-class Moon : public CelestialBody
+
+class MoonPos : public CelestialBody
 {
 
 private:
@@ -49,12 +50,12 @@ private:
 
 public:
 
-    Moon(double mjd);
-    Moon();
-    ~Moon();
+    MoonPos(double mjd);
+    MoonPos();
+    ~MoonPos();
     void updatePosition(double mjd, double lst, double lat, Star *ourSun);
     // void newImage();
 };
 
 
-#endif // _MOON_HXX_
+#endif // _MOONPOS_HXX_

simgear/ephemeris/stardata.cxx

@@ -1,4 +1,4 @@
-// stars.cxx -- manage star data
+// stardata.cxx -- manage star data
 //
 // Written by Curtis Olson, started March 2000.
 //
@@ -25,7 +25,7 @@
 #include <simgear/debug/logstream.hxx>
 #include <simgear/misc/fgstream.hxx>
 
-#include "stars.hxx"
+#include "stardata.hxx"
 
 #ifdef _MSC_VER
   FG_USING_STD(getline);

simgear/ephemeris/stardata.hxx

@@ -1,4 +1,4 @@
-// stars.hxx -- manage star data
+// stardata.hxx -- manage star data
 //
 // Written by Curtis Olson, started March 2000.
 //