MacOS X fix

[simgear.git] / simgear / props / props.cxx

diff --git a/simgear/props/props.cxx b/simgear/props/props.cxx
index abd20b19545a27de76cece21e461c12c68314eb6..0bc56dcd6fd786241e9b9b57468e95b23e3338af 100644 (file)
--- a/simgear/props/props.cxx
+++ b/simgear/props/props.cxx
@@ -6,6 +6,10 @@
 //
 // $Id$
 
+#ifdef HAVE_CONFIG_H
+#  include <simgear_config.h>
+#endif
+
 #include "props.hxx"
 
 #include <algorithm>
@@ -515,6 +519,8 @@ SGPropertyNode::clearValue ()
             }
             _local_val.string_val = 0;
             break;
+        default: // avoid compiler warning
+            break;
         }
         delete _value.val;
         _value.val = 0;
@@ -1588,6 +1594,8 @@ std::ostream& SGPropertyNode::printOn(std::ostream& stream) const
         break;
     case props::NONE:
         break;
+    default: // avoid compiler warning
+        break;
     }
     return stream;
 }
@@ -2299,8 +2307,6 @@ SGPropertyChangeListener::unregister_property (SGPropertyNode * node)
     _properties.erase(it);
 }
 
-namespace simgear
-{
 template<>
 std::ostream& SGRawBase<SGVec3d>::printOn(std::ostream& stream) const
 {
@@ -2314,6 +2320,8 @@ std::ostream& SGRawBase<SGVec3d>::printOn(std::ostream& stream) const
     return stream;
 }
 
+namespace simgear
+{
 template<>
 std::istream& readFrom<SGVec3d>(std::istream& stream, SGVec3d& result)
 {
@@ -2322,7 +2330,7 @@ std::istream& readFrom<SGVec3d>(std::istream& stream, SGVec3d& result)
     }
     return stream;
 }
-
+}
 template<>
 std::ostream& SGRawBase<SGVec4d>::printOn(std::ostream& stream) const
 {
@@ -2336,6 +2344,8 @@ std::ostream& SGRawBase<SGVec4d>::printOn(std::ostream& stream) const
     return stream;
 }
 
+namespace simgear
+{
 template<>
 std::istream& readFrom<SGVec4d>(std::istream& stream, SGVec4d& result)
 {
@@ -2344,7 +2354,6 @@ std::istream& readFrom<SGVec4d>(std::istream& stream, SGVec4d& result)
     }
     return stream;
 }
-
 }
 
 // end of props.cxx