From 8aed0e75dfc9bf8280578cefc2ebb32136692951 Mon Sep 17 00:00:00 2001 From: ThorstenB Date: Fri, 24 Feb 2012 21:47:00 +0100 Subject: [PATCH] Try to fix MSVC template instantiation issue with SGVec dependencies. --- simgear/props/props.hxx | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/simgear/props/props.hxx b/simgear/props/props.hxx index 38c9c0a2..ad7d2907 100644 --- a/simgear/props/props.hxx +++ b/simgear/props/props.hxx @@ -63,13 +63,14 @@ inline T parseString(const std::string& str) return result; } +#ifndef NO_OPENSCENEGRAPH_INTERFACE // Extended properties template<> std::istream& readFrom(std::istream& stream, SGVec3d& result); template<> std::istream& readFrom(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 { @@ -177,6 +179,8 @@ struct PropertyTraits static const Type type_tag = VEC4D; enum { Internal = 0 }; }; +#endif + } } @@ -689,10 +693,12 @@ std::istream& SGRawBase::readFrom(std::istream& stream) return stream; } +#ifndef NO_OPENSCENEGRAPH_INTERFACE template<> std::ostream& SGRawBase::printOn(std::ostream& stream) const; template<> std::ostream& SGRawBase::printOn(std::ostream& stream) const; +#endif /** -- 2.39.5