FGFS-4.1/simgear
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Try to fix MSVC template instantiation issue with SGVec dependencies."

Browse Source 
This reverts commit 8aed0e75df.
This commit is contained in:
ThorstenB 2012-02-24 22:00:58 +01:00
parent 8aed0e75df
commit f1c2afacc4
1 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
simgear/props/props.hxx
View File

@ -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
/**