Revert "Use simgear internal stuff for the singleton class."

[simgear.git] / simgear / props / props.hxx

diff --git a/simgear/props/props.hxx b/simgear/props/props.hxx
index ad7d2907e19fbb9ed50560f45beaab1fc4d34ebc..38c9c0a2e2ea058cdd9eb684b047ef00970e789b 100644 (file)
--- a/simgear/props/props.hxx
+++ b/simgear/props/props.hxx
@@ -63,14 +63,13 @@ inline T parseString(const std::string& str)
     return result;
 }
 
-#ifndef NO_OPENSCENEGRAPH_INTERFACE
 // Extended properties
 template<>
 std::istream& readFrom<SGVec3d>(std::istream& stream, SGVec3d& result);
 template<>
 std::istream& readFrom<SGVec4d>(std::istream& stream, SGVec4d& result);
-#endif
 
+    
 /**
  * Property value types.
  */
@@ -165,7 +164,6 @@ DEFINTERNALPROP(const char *, STRING);
 DEFINTERNALPROP(const char[], STRING);
 #undef DEFINTERNALPROP
 
-#ifndef NO_OPENSCENEGRAPH_INTERFACE
 template<>
 struct PropertyTraits<SGVec3d>
 {
@@ -179,8 +177,6 @@ struct PropertyTraits<SGVec4d>
     static const Type type_tag = VEC4D;
     enum  { Internal = 0 };
 };
-#endif
-
 }
 }
 
@@ -693,12 +689,10 @@ std::istream& SGRawBase<T, 0>::readFrom(std::istream& stream)
     return stream;
 }
 
-#ifndef NO_OPENSCENEGRAPH_INTERFACE
 template<>
 std::ostream& SGRawBase<SGVec3d>::printOn(std::ostream& stream) const;
 template<>
 std::ostream& SGRawBase<SGVec4d>::printOn(std::ostream& stream) const;
-#endif
 
 \f
 /**