Code cleanups.

(no functionality change)

diff --git a/simgear/scene/sky/cloud.cxx b/simgear/scene/sky/cloud.cxx
index cdd851b47486dc0e2d2fa62f6d2dbff11ed6369e..e3522dda4e2b866e320f27fd68928cb0024b5156 100644 (file)
--- a/simgear/scene/sky/cloud.cxx
+++ b/simgear/scene/sky/cloud.cxx
@@ -60,18 +60,6 @@
 using namespace simgear;
 using namespace osg;
 
-#if defined(__MINGW32__)
-#define isnan(x) _isnan(x)
-#endif
-
-// #if defined (__FreeBSD__)
-// #  if __FreeBSD_version < 500000
-//      extern "C" {
-//        inline int isnan(double r) { return !(r <= 0 || r >= 0); }
-//      }
-// #  endif
-// #endif
-
 static osg::ref_ptr<osg::StateSet> layer_states[SGCloudLayer::SG_MAX_CLOUD_COVERAGES];
 static osg::ref_ptr<osg::StateSet> layer_states2[SGCloudLayer::SG_MAX_CLOUD_COVERAGES];
 static osg::ref_ptr<osg::TextureCubeMap> cubeMap;
@@ -735,7 +723,7 @@ bool SGCloudLayer::reposition( const SGVec3f& p, const SGVec3f& up, double lon,
             // this happens, lets just use the last known good course.
             // This is a hack, and it would probably be better to make
             // calc_gc_course_dist() more robust.
-            if ( isnan(course) ) {
+            if ( isNaN(course) ) {
                 course = last_course;
             } else {
                 last_course = course;

diff --git a/simgear/scene/sky/cloud.hxx b/simgear/scene/sky/cloud.hxx
index 95f6dbbedbd879b8c9c19b75ebf5e4610455a71b..c79481af7d944cdff1b773c4c99d420b8cc476e9 100644 (file)
--- a/simgear/scene/sky/cloud.hxx
+++ b/simgear/scene/sky/cloud.hxx
@@ -33,7 +33,6 @@
 #include <simgear/structure/SGReferenced.hxx>
 
 #include <string>
-using std::string;
 
 #include <osg/ref_ptr>
 #include <osg/Array>
@@ -74,7 +73,7 @@ public:
      * Constructor
      * @param tex_path the path to the set of cloud textures
      */
-    SGCloudLayer( const string &tex_path );
+    SGCloudLayer( const std::string &tex_path );
 
     /**
      * Destructor
@@ -141,16 +140,16 @@ public:
     void setCoverage (Coverage coverage);
 
     /** get coverage as string */
-    const string & getCoverageString() const;
+    const std::string & getCoverageString() const;
 
     /** get coverage as string */
-    static const string & getCoverageString( Coverage coverage );
+    static const std::string & getCoverageString( Coverage coverage );
 
     /** get coverage type from string */
     static Coverage getCoverageType( const std::string & coverage );
 
     /** set coverage as string */
-    void setCoverageString( const string & coverage );
+    void setCoverageString( const std::string & coverage );
 
     /**
      * set the cloud movement direction

diff --git a/simgear/scene/sky/cloudfield.cxx b/simgear/scene/sky/cloudfield.cxx
index 45ae15f83c4b4cd9feb71f7d376b28e5578b0d0d..13ee30308e2af063a3fb5c22b8af83ab7683bdb1 100644 (file)
--- a/simgear/scene/sky/cloudfield.cxx
+++ b/simgear/scene/sky/cloudfield.cxx
@@ -51,18 +51,6 @@ using std::vector;
 #include "newcloud.hxx"
 #include "cloudfield.hxx"
 
-#if defined(__MINGW32__)
-#define isnan(x) _isnan(x)
-#endif
-
-#if defined (__FreeBSD__)
-#  if __FreeBSD_version < 500000
-     extern "C" {
-       inline int isnan(double r) { return !(r <= 0 || r >= 0); }
-     }
-#  endif
-#endif
-
 using namespace simgear;
 
 float SGCloudField::fieldSize = 50000.0f;

diff --git a/simgear/scene/sky/sky.cxx b/simgear/scene/sky/sky.cxx
index e5535059e991b9a601496f1cc19ee124c712661d..71160207245b39dbe84b9582fd39c721a29f8e6f 100644 (file)
--- a/simgear/scene/sky/sky.cxx
+++ b/simgear/scene/sky/sky.cxx
@@ -293,7 +293,7 @@ void SGSky::set_3dCloudUseImpostors(bool imp)
     SGCloudField::setUseImpostors(imp);
 }
 
-void SGSky::texture_path( const string& path ) {
+void SGSky::texture_path( const std::string& path ) {
        tex_path = SGPath( path );
 }
 

diff --git a/simgear/scene/sky/sky.hxx b/simgear/scene/sky/sky.hxx
index 09d9b4cace8154aaba7a5748c88d6ed7a3ff56e6..6b99d4aca3bce1f988bc913b7bae243d8021e83c 100644 (file)
--- a/simgear/scene/sky/sky.hxx
+++ b/simgear/scene/sky/sky.hxx
@@ -352,7 +352,7 @@ public:
      * Specify the texture path (optional, defaults to current directory)
      * @param path base path to texture locations
      */
-    void texture_path( const string& path );
+    void texture_path( const std::string& path );
 
     /**
      * Get the current sun color