From f1c2afacc4124ddf74a384412d5e3f9be0d40136 Mon Sep 17 00:00:00 2001 From: ThorstenB Date: Fri, 24 Feb 2012 22:00:58 +0100 Subject: [PATCH] Revert "Try to fix MSVC template instantiation issue with SGVec dependencies." This reverts commit 8aed0e75dfc9bf8280578cefc2ebb32136692951. --- simgear/props/props.hxx | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/simgear/props/props.hxx b/simgear/props/props.hxx index ad7d2907..38c9c0a2 100644 --- 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(std::istream& stream, SGVec3d& result); template<> std::istream& readFrom(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 { @@ -179,8 +177,6 @@ struct PropertyTraits static const Type type_tag = VEC4D; enum { Internal = 0 }; }; -#endif - } } @@ -693,12 +689,10 @@ 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