From 4e0f8ff097ad10e1278d2ce388e69432eafb7538 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Thu, 5 Dec 2013 01:57:22 +0100 Subject: [PATCH] SceneGraph: remove integer TranslationTransformation template instance. We can now use the *.hpp for that even on Windows. --- src/SceneGraph/Object.h | 3 --- src/SceneGraph/Test/TranslationTransformationTest.cpp | 3 ++- src/SceneGraph/TranslationTransformation.h | 2 -- src/SceneGraph/instantiation.cpp | 2 -- 4 files changed, 2 insertions(+), 8 deletions(-) diff --git a/src/SceneGraph/Object.h b/src/SceneGraph/Object.h index e87bb3426..903101e64 100644 --- a/src/SceneGraph/Object.h +++ b/src/SceneGraph/Object.h @@ -90,12 +90,9 @@ class documentation or @ref compilation-speedup-hpp for more information. - @ref RigidMatrixTransformation3D "Object" - @ref TranslationTransformation2D "Object" - @ref TranslationTransformation3D "Object" -- @ref BasicTranslationTransformation2D "Object>" -- @ref BasicTranslationTransformation3D "Object>" @see @ref Scene, @ref AbstractFeature, @ref AbstractTransformation, @ref DebugTools::ObjectRenderer -@todo Test (and fix) that hpp works also on Windows */ template class Object: public AbstractObject, public Transformation #ifndef DOXYGEN_GENERATING_OUTPUT diff --git a/src/SceneGraph/Test/TranslationTransformationTest.cpp b/src/SceneGraph/Test/TranslationTransformationTest.cpp index 801fd4b1e..84857c777 100644 --- a/src/SceneGraph/Test/TranslationTransformationTest.cpp +++ b/src/SceneGraph/Test/TranslationTransformationTest.cpp @@ -25,6 +25,7 @@ #include #include +#include "SceneGraph/Object.hpp" #include "SceneGraph/TranslationTransformation.h" #include "SceneGraph/Scene.h" @@ -131,7 +132,7 @@ void TranslationTransformationTest::translate() { } void TranslationTransformationTest::integral() { - typedef Object> Object2Di; + typedef Object> Object2Di; Object2Di o; o.translate({3, -7}); diff --git a/src/SceneGraph/TranslationTransformation.h b/src/SceneGraph/TranslationTransformation.h index adc134120..3d63d484c 100644 --- a/src/SceneGraph/TranslationTransformation.h +++ b/src/SceneGraph/TranslationTransformation.h @@ -209,8 +209,6 @@ template struct Transfor #ifdef _WIN32 extern template class MAGNUM_SCENEGRAPH_EXPORT Object>; extern template class MAGNUM_SCENEGRAPH_EXPORT Object>; -extern template class MAGNUM_SCENEGRAPH_EXPORT Object>; -extern template class MAGNUM_SCENEGRAPH_EXPORT Object>; #endif }} diff --git a/src/SceneGraph/instantiation.cpp b/src/SceneGraph/instantiation.cpp index 015fa8c8b..b04fd0964 100644 --- a/src/SceneGraph/instantiation.cpp +++ b/src/SceneGraph/instantiation.cpp @@ -74,8 +74,6 @@ template class MAGNUM_SCENEGRAPH_EXPORT_HPP Object>; template class MAGNUM_SCENEGRAPH_EXPORT_HPP Object>; template class MAGNUM_SCENEGRAPH_EXPORT_HPP Object>; -template class MAGNUM_SCENEGRAPH_EXPORT_HPP Object>; -template class MAGNUM_SCENEGRAPH_EXPORT_HPP Object>; #endif }}