X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=simgear%2Fmath%2FSGVec2.hxx;h=0695cded19f232e7cc14b698e2f1c6892be2e0fe;hb=914d3e6a2b323cf9f186cbef2aef7865ea07b309;hp=65c802ea3912ac5af7b18e7b7fdf332768b12f66;hpb=819d3f5ded821235bd1c9bf0350b683ac7b5df89;p=simgear.git diff --git a/simgear/math/SGVec2.hxx b/simgear/math/SGVec2.hxx index 65c802ea..0695cded 100644 --- a/simgear/math/SGVec2.hxx +++ b/simgear/math/SGVec2.hxx @@ -18,14 +18,7 @@ #ifndef SGVec2_H #define SGVec2_H -#if defined ( __CYGWIN__ ) -#include -#endif - -#ifndef NO_OPENSCENEGRAPH_INTERFACE -#include -#include -#endif +#include /// 2D Vector Class template @@ -375,27 +368,4 @@ SGVec2d toVec2d(const SGVec2f& v) { return SGVec2d(v(0), v(1)); } -#ifndef NO_OPENSCENEGRAPH_INTERFACE -inline -SGVec2d -toSG(const osg::Vec2d& v) -{ return SGVec2d(v[0], v[1]); } - -inline -SGVec2f -toSG(const osg::Vec2f& v) -{ return SGVec2f(v[0], v[1]); } - -inline -osg::Vec2d -toOsg(const SGVec2d& v) -{ return osg::Vec2d(v[0], v[1]); } - -inline -osg::Vec2f -toOsg(const SGVec2f& v) -{ return osg::Vec2f(v[0], v[1]); } - -#endif - #endif