diff --git a/apps/openmw_test_suite/detournavigator/operators.hpp b/apps/openmw_test_suite/detournavigator/operators.hpp index 8e6b97af6..16d8f38f5 100644 --- a/apps/openmw_test_suite/detournavigator/operators.hpp +++ b/apps/openmw_test_suite/detournavigator/operators.hpp @@ -3,7 +3,6 @@ #include #include -#include #include #include diff --git a/apps/openmw_test_suite/nifloader/testbulletnifloader.cpp b/apps/openmw_test_suite/nifloader/testbulletnifloader.cpp index 5866b7646..29f60b1f5 100644 --- a/apps/openmw_test_suite/nifloader/testbulletnifloader.cpp +++ b/apps/openmw_test_suite/nifloader/testbulletnifloader.cpp @@ -115,17 +115,6 @@ static std::ostream& operator <<(std::ostream& stream, const btCollisionShape* v return value ? stream << "&" << *value : stream << "nullptr"; } -namespace osg -{ - static std::ostream& operator <<(std::ostream& stream, const Vec3f& value) - { - return stream << "osg::Vec3f {" - << value.x() << ", " - << value.y() << ", " - << value.z() << "}"; - } -} - namespace std { static std::ostream& operator <<(std::ostream& stream, const map& value) @@ -153,7 +142,7 @@ namespace Resource return stream << "Resource::BulletShape {" << value.mCollisionShape << ", " << value.mAvoidCollisionShape << ", " - << value.mCollisionBoxHalfExtents << ", " + << "osg::Vec3f {" << value.mCollisionBoxHalfExtents << "}" << ", " << value.mAnimatedShapes << "}"; } diff --git a/components/debug/debuglog.hpp b/components/debug/debuglog.hpp index f5cdffeda..0676f7689 100644 --- a/components/debug/debuglog.hpp +++ b/components/debug/debuglog.hpp @@ -4,6 +4,8 @@ #include #include +#include + namespace Debug { enum Level diff --git a/components/detournavigator/debug.hpp b/components/detournavigator/debug.hpp index 460e22435..05d212e2f 100644 --- a/components/detournavigator/debug.hpp +++ b/components/detournavigator/debug.hpp @@ -3,9 +3,10 @@ #include "tilebounds.hpp" +#include + #include #include -#include #include #include diff --git a/components/osghelpers/operators.hpp b/components/osghelpers/operators.hpp deleted file mode 100644 index fdb0227ea..000000000 --- a/components/osghelpers/operators.hpp +++ /dev/null @@ -1,35 +0,0 @@ -#ifndef OPENMW_COMPONENTS_OSGHELPERS_OPERATORS_H -#define OPENMW_COMPONENTS_OSGHELPERS_OPERATORS_H - -#include -#include -#include - -#include -#include -#include - -namespace osg -{ - inline std::ostream& operator <<(std::ostream& stream, const Vec2i& value) - { - return stream << "osg::Vec2i(" << value.x() << ", " << value.y() << ")"; - } - - inline std::ostream& operator <<(std::ostream& stream, const Vec2f& value) - { - return stream << "osg::Vec2f(" << std::setprecision(std::numeric_limits::max_exponent10) << value.x() - << ", " << std::setprecision(std::numeric_limits::max_exponent10) << value.y() - << ')'; - } - - inline std::ostream& operator <<(std::ostream& stream, const Vec3f& value) - { - return stream << "osg::Vec3f(" << std::setprecision(std::numeric_limits::max_exponent10) << value.x() - << ", " << std::setprecision(std::numeric_limits::max_exponent10) << value.y() - << ", " << std::setprecision(std::numeric_limits::max_exponent10) << value.z() - << ')'; - } -} - -#endif