Changeset 10774 for code/branches/cpp11_v2/src/modules

Timestamp:

Nov 7, 2015, 10:46:11 PM (9 years ago)

Author:

landauf

Message:

using static_assert instead of BOOST_STATIC_ASSERT

Location:

code/branches/cpp11_v2/src/modules/overlays

Files:

• OverlayText.cc (modified) (2 diffs)
• hud/HUDNavigation.cc (modified) (1 diff)

code/branches/cpp11_v2/src/modules/overlays/OverlayText.cc

@@ -32 +32 @@
 #include <OgrePanelOverlayElement.h>
 #include <OgreTextAreaOverlayElement.h>
-#include <boost/static_assert.hpp>
 
 #include "util/StringUtils.h"
@@ -43 +42 @@
     RegisterClass(OverlayText);
 
-    BOOST_STATIC_ASSERT((int)Ogre::TextAreaOverlayElement::Left   == (int)OverlayText::Left);
-    BOOST_STATIC_ASSERT((int)Ogre::TextAreaOverlayElement::Center == (int)OverlayText::Center);
-    BOOST_STATIC_ASSERT((int)Ogre::TextAreaOverlayElement::Right  == (int)OverlayText::Right);
+    static_assert((int)Ogre::TextAreaOverlayElement::Left   == (int)OverlayText::Left,   "check enum");
+    static_assert((int)Ogre::TextAreaOverlayElement::Center == (int)OverlayText::Center, "check enum");
+    static_assert((int)Ogre::TextAreaOverlayElement::Right  == (int)OverlayText::Right,  "check enum");
 
     OverlayText::OverlayText(Context* context)

code/branches/cpp11_v2/src/modules/overlays/hud/HUDNavigation.cc

@@ -53 +53 @@
 #include "core/config/ConfigValueIncludes.h"
 #include "tools/TextureGenerator.h"
-// #include <boost/bind/bind_template.hpp>