[Orxonox-commit 6116] r10774 - in code/branches/cpp11_v2/src: libraries/core/class libraries/core/object libraries/network libraries/network/packet modules/overlays modules/overlays/hud orxonox/graphics orxonox/worldentities
landauf at orxonox.net
landauf at orxonox.net
Sat Nov 7 22:46:12 CET 2015
Author: landauf
Date: 2015-11-07 22:46:11 +0100 (Sat, 07 Nov 2015)
New Revision: 10774
Modified:
code/branches/cpp11_v2/src/libraries/core/class/Identifier.h
code/branches/cpp11_v2/src/libraries/core/object/IteratorBase.h
code/branches/cpp11_v2/src/libraries/core/object/ObjectList.h
code/branches/cpp11_v2/src/libraries/network/Connection.h
code/branches/cpp11_v2/src/libraries/network/GamestateManager.h
code/branches/cpp11_v2/src/libraries/network/NetworkFunctionIncludes.h
code/branches/cpp11_v2/src/libraries/network/packet/Packet.cc
code/branches/cpp11_v2/src/modules/overlays/OverlayText.cc
code/branches/cpp11_v2/src/modules/overlays/hud/HUDNavigation.cc
code/branches/cpp11_v2/src/orxonox/graphics/Light.cc
code/branches/cpp11_v2/src/orxonox/worldentities/WorldEntity.cc
Log:
using static_assert instead of BOOST_STATIC_ASSERT
Modified: code/branches/cpp11_v2/src/libraries/core/class/Identifier.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/class/Identifier.h 2015-11-07 17:03:26 UTC (rev 10773)
+++ code/branches/cpp11_v2/src/libraries/core/class/Identifier.h 2015-11-07 21:46:11 UTC (rev 10774)
@@ -79,8 +79,6 @@
#include <string>
#include <typeinfo>
#include <loki/TypeTraits.h>
-#include <boost/static_assert.hpp>
-#include <boost/type_traits/is_base_of.hpp>
#include "util/Output.h"
#include "util/OrxAssert.h"
@@ -268,7 +266,7 @@
template <class T>
class ClassIdentifier : public Identifier
{
- BOOST_STATIC_ASSERT((boost::is_base_of<Identifiable, T>::value));
+ static_assert(std::is_base_of<Identifiable, T>::value, "ClassIdentifier can only be used with Identifiables");
#ifndef DOXYGEN_SHOULD_SKIP_THIS
#define SUPER_INTRUSIVE_DECLARATION_INCLUDE
Modified: code/branches/cpp11_v2/src/libraries/core/object/IteratorBase.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/object/IteratorBase.h 2015-11-07 17:03:26 UTC (rev 10773)
+++ code/branches/cpp11_v2/src/libraries/core/object/IteratorBase.h 2015-11-07 21:46:11 UTC (rev 10774)
@@ -37,9 +37,6 @@
#include "core/CorePrereqs.h"
-#include <boost/static_assert.hpp>
-#include <boost/type_traits/is_base_of.hpp>
-
#include "ObjectListBase.h"
namespace orxonox
@@ -51,7 +48,7 @@
template <class T, class I>
class IteratorBase : public ObjectListElementRemovalListener
{
- BOOST_STATIC_ASSERT((boost::is_base_of<Listable, T>::value));
+ static_assert(std::is_base_of<Listable, T>::value, "IteratorBase can only be used with Listables");
public:
/**
Modified: code/branches/cpp11_v2/src/libraries/core/object/ObjectList.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/object/ObjectList.h 2015-11-07 17:03:26 UTC (rev 10773)
+++ code/branches/cpp11_v2/src/libraries/core/object/ObjectList.h 2015-11-07 21:46:11 UTC (rev 10774)
@@ -46,9 +46,6 @@
#include "core/CorePrereqs.h"
-#include <boost/static_assert.hpp>
-#include <boost/type_traits/is_base_of.hpp>
-
#include "ObjectListBase.h"
#include "ObjectListIterator.h"
#include "Context.h"
@@ -68,7 +65,7 @@
template <class T>
class ObjectList
{
- BOOST_STATIC_ASSERT((boost::is_base_of<Listable, T>::value));
+ static_assert(std::is_base_of<Listable, T>::value, "ObjectList can only be used with Listables");
public:
typedef ObjectListIterator<T> iterator;
Modified: code/branches/cpp11_v2/src/libraries/network/Connection.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/network/Connection.h 2015-11-07 17:03:26 UTC (rev 10773)
+++ code/branches/cpp11_v2/src/libraries/network/Connection.h 2015-11-07 21:46:11 UTC (rev 10774)
@@ -45,7 +45,6 @@
#include <deque>
#include <map>
#include <enet/enet.h>
-#include <boost/concept_check.hpp>
namespace boost
{
Modified: code/branches/cpp11_v2/src/libraries/network/GamestateManager.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/network/GamestateManager.h 2015-11-07 17:03:26 UTC (rev 10773)
+++ code/branches/cpp11_v2/src/libraries/network/GamestateManager.h 2015-11-07 21:46:11 UTC (rev 10774)
@@ -46,7 +46,6 @@
#include "GamestateHandler.h"
#include "core/CorePrereqs.h"
#include "packet/Gamestate.h"
-#include <boost/concept_check.hpp>
namespace orxonox
{
Modified: code/branches/cpp11_v2/src/libraries/network/NetworkFunctionIncludes.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/network/NetworkFunctionIncludes.h 2015-11-07 17:03:26 UTC (rev 10773)
+++ code/branches/cpp11_v2/src/libraries/network/NetworkFunctionIncludes.h 2015-11-07 21:46:11 UTC (rev 10774)
@@ -32,7 +32,6 @@
#include "NetworkPrereqs.h"
#include <boost/preprocessor/cat.hpp>
-#include <boost/static_assert.hpp>
#include "NetworkFunction.h"
#include "core/module/StaticallyInitializedInstance.h"
@@ -71,7 +70,7 @@
template<class PT>
inline NetworkFunctionBase* registerStaticNetworkFunctionFct(PT ptr, const std::string& name)
{
- BOOST_STATIC_ASSERT(sizeof(PT) <= sizeof(NetworkFunctionPointer)); // if this fails your compiler uses bigger pointers for static functions than defined above
+ static_assert(sizeof(PT) <= sizeof(NetworkFunctionPointer), "check pointer size"); // if this fails your compiler uses bigger pointers for static functions than defined above
NetworkFunctionPointer destptr;
copyPtr(ptr, destptr);
return new NetworkFunctionStatic(createFunctor(ptr), name, destptr);
@@ -80,7 +79,7 @@
template<class T, class PT>
inline NetworkFunctionBase* registerMemberNetworkFunctionFct(PT ptr, const std::string& name)
{
- BOOST_STATIC_ASSERT(sizeof(PT) <= sizeof(NetworkFunctionPointer)); // if this fails your compiler uses bigger pointers for a specific kind of member functions than defined above
+ static_assert(sizeof(PT) <= sizeof(NetworkFunctionPointer), "check pointer size"); // if this fails your compiler uses bigger pointers for a specific kind of member functions than defined above
NetworkFunctionPointer destptr;
copyPtr(ptr, destptr);
return new NetworkMemberFunction<T>(createFunctor(ptr), name, destptr);
Modified: code/branches/cpp11_v2/src/libraries/network/packet/Packet.cc
===================================================================
--- code/branches/cpp11_v2/src/libraries/network/packet/Packet.cc 2015-11-07 17:03:26 UTC (rev 10773)
+++ code/branches/cpp11_v2/src/libraries/network/packet/Packet.cc 2015-11-07 21:46:11 UTC (rev 10774)
@@ -33,7 +33,6 @@
#include <cstring>
#define WIN32_LEAN_AND_MEAN
#include <enet/enet.h>
-#include <boost/static_assert.hpp>
#include <boost/thread/mutex.hpp>
#include "util/Output.h"
@@ -53,9 +52,9 @@
namespace packet{
// Make sure we assume the right values
-BOOST_STATIC_ASSERT(static_cast<int>(PacketFlag::Reliable) == static_cast<int>(ENET_PACKET_FLAG_RELIABLE));
-BOOST_STATIC_ASSERT(static_cast<int>(PacketFlag::Unsequenced) == static_cast<int>(ENET_PACKET_FLAG_UNSEQUENCED));
-BOOST_STATIC_ASSERT(static_cast<int>(PacketFlag::NoAllocate) == static_cast<int>(ENET_PACKET_FLAG_NO_ALLOCATE));
+static_assert(static_cast<int>(PacketFlag::Reliable) == static_cast<int>(ENET_PACKET_FLAG_RELIABLE), "check enum");
+static_assert(static_cast<int>(PacketFlag::Unsequenced) == static_cast<int>(ENET_PACKET_FLAG_UNSEQUENCED), "check enum");
+static_assert(static_cast<int>(PacketFlag::NoAllocate) == static_cast<int>(ENET_PACKET_FLAG_NO_ALLOCATE), "check enum");
#define PACKET_FLAG_DEFAULT PacketFlag::NoAllocate
#define _PACKETID 0
Modified: code/branches/cpp11_v2/src/modules/overlays/OverlayText.cc
===================================================================
--- code/branches/cpp11_v2/src/modules/overlays/OverlayText.cc 2015-11-07 17:03:26 UTC (rev 10773)
+++ code/branches/cpp11_v2/src/modules/overlays/OverlayText.cc 2015-11-07 21:46:11 UTC (rev 10774)
@@ -31,7 +31,6 @@
#include <OgreOverlayManager.h>
#include <OgrePanelOverlayElement.h>
#include <OgreTextAreaOverlayElement.h>
-#include <boost/static_assert.hpp>
#include "util/StringUtils.h"
#include "core/CoreIncludes.h"
@@ -42,9 +41,9 @@
{
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)
: OrxonoxOverlay(context)
Modified: code/branches/cpp11_v2/src/modules/overlays/hud/HUDNavigation.cc
===================================================================
--- code/branches/cpp11_v2/src/modules/overlays/hud/HUDNavigation.cc 2015-11-07 17:03:26 UTC (rev 10773)
+++ code/branches/cpp11_v2/src/modules/overlays/hud/HUDNavigation.cc 2015-11-07 21:46:11 UTC (rev 10774)
@@ -52,7 +52,6 @@
#include "worldentities/WorldEntity.h"
#include "core/config/ConfigValueIncludes.h"
#include "tools/TextureGenerator.h"
-// #include <boost/bind/bind_template.hpp>
namespace orxonox
Modified: code/branches/cpp11_v2/src/orxonox/graphics/Light.cc
===================================================================
--- code/branches/cpp11_v2/src/orxonox/graphics/Light.cc 2015-11-07 17:03:26 UTC (rev 10773)
+++ code/branches/cpp11_v2/src/orxonox/graphics/Light.cc 2015-11-07 21:46:11 UTC (rev 10774)
@@ -30,7 +30,6 @@
#include <OgreSceneManager.h>
#include <OgreLight.h>
-#include <boost/static_assert.hpp>
#include "util/StringUtils.h"
#include "util/Exception.h"
@@ -44,9 +43,9 @@
RegisterClass(Light);
// Be sure we don't do bad conversions
- BOOST_STATIC_ASSERT((int)Ogre::Light::LT_POINT == (int)Light::Point);
- BOOST_STATIC_ASSERT((int)Ogre::Light::LT_DIRECTIONAL == (int)Light::Directional);
- BOOST_STATIC_ASSERT((int)Ogre::Light::LT_SPOTLIGHT == (int)Light::Spotlight);
+ static_assert((int)Ogre::Light::LT_POINT == (int)Light::Point, "check enum");
+ static_assert((int)Ogre::Light::LT_DIRECTIONAL == (int)Light::Directional, "check enum");
+ static_assert((int)Ogre::Light::LT_SPOTLIGHT == (int)Light::Spotlight, "check enum");
Light::Light(Context* context) : StaticEntity(context)
{
Modified: code/branches/cpp11_v2/src/orxonox/worldentities/WorldEntity.cc
===================================================================
--- code/branches/cpp11_v2/src/orxonox/worldentities/WorldEntity.cc 2015-11-07 17:03:26 UTC (rev 10773)
+++ code/branches/cpp11_v2/src/orxonox/worldentities/WorldEntity.cc 2015-11-07 21:46:11 UTC (rev 10774)
@@ -36,7 +36,6 @@
#include <OgreSceneManager.h>
#include <OgreSceneNode.h>
#include <BulletDynamics/Dynamics/btRigidBody.h>
-#include <boost/static_assert.hpp>
#include "util/OrxAssert.h"
#include "util/Convert.h"
@@ -56,9 +55,9 @@
const Vector3 WorldEntity::UP = Vector3::UNIT_Y;
// Be sure we don't do bad conversions
- BOOST_STATIC_ASSERT((int)Ogre::Node::TS_LOCAL == (int)WorldEntity::Local);
- BOOST_STATIC_ASSERT((int)Ogre::Node::TS_PARENT == (int)WorldEntity::Parent);
- BOOST_STATIC_ASSERT((int)Ogre::Node::TS_WORLD == (int)WorldEntity::World);
+ static_assert((int)Ogre::Node::TS_LOCAL == (int)WorldEntity::Local, "check enum");
+ static_assert((int)Ogre::Node::TS_PARENT == (int)WorldEntity::Parent, "check enum");
+ static_assert((int)Ogre::Node::TS_WORLD == (int)WorldEntity::World, "check enum");
RegisterAbstractClass(WorldEntity).inheritsFrom<BaseObject>().inheritsFrom<Synchronisable>();
More information about the Orxonox-commit
mailing list