From 679ca80af57722417d76f2e09b4b80f4fd82135b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Sat, 26 Jan 2013 00:59:31 +0100 Subject: [PATCH] SceneGraph: minor cleanup. --- src/SceneGraph/Animable.h | 2 +- src/SceneGraph/Camera3D.hpp | 2 -- src/SceneGraph/magnumSceneGraphVisibility.h | 4 ++-- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/SceneGraph/Animable.h b/src/SceneGraph/Animable.h index 5b4a74edc..000130d33 100644 --- a/src/SceneGraph/Animable.h +++ b/src/SceneGraph/Animable.h @@ -28,7 +28,7 @@ namespace Magnum { namespace SceneGraph { /** @brief Animation state -@see Animatable::setState() +@see Animable::setState() */ enum class AnimationState: std::uint8_t { /** diff --git a/src/SceneGraph/Camera3D.hpp b/src/SceneGraph/Camera3D.hpp index 0e97d1715..2ca805a09 100644 --- a/src/SceneGraph/Camera3D.hpp +++ b/src/SceneGraph/Camera3D.hpp @@ -22,8 +22,6 @@ #include "AbstractCamera.hpp" #include "Camera3D.h" -using namespace std; - namespace Magnum { namespace SceneGraph { template Camera3D* Camera3D::setOrthographic(const Math::Vector2& size, T near, T far) { diff --git a/src/SceneGraph/magnumSceneGraphVisibility.h b/src/SceneGraph/magnumSceneGraphVisibility.h index cd1be31fa..fca3dc0bc 100644 --- a/src/SceneGraph/magnumSceneGraphVisibility.h +++ b/src/SceneGraph/magnumSceneGraphVisibility.h @@ -21,10 +21,10 @@ #else #define MAGNUM_SCENEGRAPH_EXPORT __declspec(dllimport) #endif - #define SCENEGRAPH_LOCAL + #define MAGNUM_SCENEGRAPH_LOCAL #else #define MAGNUM_SCENEGRAPH_EXPORT __attribute__ ((visibility ("default"))) - #define SCENEGRAPH_LOCAL __attribute__ ((visibility ("hidden"))) + #define MAGNUM_SCENEGRAPH_LOCAL __attribute__ ((visibility ("hidden"))) #endif #endif