]> git.mxchange.org Git - simgear.git/commitdiff
Try to fix MSVC template instantiation issue with SGVec dependencies.
authorThorstenB <brehmt@gmail.com>
Fri, 24 Feb 2012 20:47:00 +0000 (21:47 +0100)
committerThorstenB <brehmt@gmail.com>
Fri, 24 Feb 2012 20:47:00 +0000 (21:47 +0100)
simgear/props/props.hxx

index 38c9c0a2e2ea058cdd9eb684b047ef00970e789b..ad7d2907e19fbb9ed50560f45beaab1fc4d34ebc 100644 (file)
@@ -63,13 +63,14 @@ 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.
  */
@@ -164,6 +165,7 @@ DEFINTERNALPROP(const char *, STRING);
 DEFINTERNALPROP(const char[], STRING);
 #undef DEFINTERNALPROP
 
+#ifndef NO_OPENSCENEGRAPH_INTERFACE
 template<>
 struct PropertyTraits<SGVec3d>
 {
@@ -177,6 +179,8 @@ struct PropertyTraits<SGVec4d>
     static const Type type_tag = VEC4D;
     enum  { Internal = 0 };
 };
+#endif
+
 }
 }
 
@@ -689,10 +693,12 @@ 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
 /**