X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=simgear%2Fmath%2FSGVec3.hxx;h=dbc8af543bf9a5d39a933be30d55e32b9dfc9c43;hb=914d3e6a2b323cf9f186cbef2aef7865ea07b309;hp=8483f92a69ced9c2dc8164724a802f0c92c22660;hpb=fddac2443dfb61fe291aa6102371e64aa31bb9e2;p=simgear.git diff --git a/simgear/math/SGVec3.hxx b/simgear/math/SGVec3.hxx index 8483f92a..dbc8af54 100644 --- a/simgear/math/SGVec3.hxx +++ b/simgear/math/SGVec3.hxx @@ -18,10 +18,7 @@ #ifndef SGVec3_H #define SGVec3_H -#ifndef NO_OPENSCENEGRAPH_INTERFACE -#include -#include -#endif +#include /// 3D Vector Class template @@ -31,7 +28,6 @@ public: #ifdef __GNUC__ // Avoid "_data not initialized" warnings (see comment below). -# pragma GCC diagnostic push # pragma GCC diagnostic ignored "-Wuninitialized" #endif @@ -50,7 +46,7 @@ public: #ifdef __GNUC__ // Restore warning settings. -# pragma GCC diagnostic pop +# pragma GCC diagnostic warning "-Wuninitialized" #endif /// Constructor. Initialize by the given values @@ -506,26 +502,4 @@ SGVec3d toVec3d(const SGVec3f& v) { return SGVec3d(v(0), v(1), v(2)); } -#ifndef NO_OPENSCENEGRAPH_INTERFACE -inline -SGVec3d -toSG(const osg::Vec3d& v) -{ return SGVec3d(v[0], v[1], v[2]); } - -inline -SGVec3f -toSG(const osg::Vec3f& v) -{ return SGVec3f(v[0], v[1], v[2]); } - -inline -osg::Vec3d -toOsg(const SGVec3d& v) -{ return osg::Vec3d(v[0], v[1], v[2]); } - -inline -osg::Vec3f -toOsg(const SGVec3f& v) -{ return osg::Vec3f(v[0], v[1], v[2]); } -#endif - #endif