From 93843d024c01633dbec773fad3ed15fda6c3e9d0 Mon Sep 17 00:00:00 2001 From: AnyOldName3 Date: Wed, 31 Oct 2018 16:26:53 +0000 Subject: [PATCH] Remove another duplicate operator<< --- .../nifloader/testbulletnifloader.cpp | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) 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 << "}"; }