Context Navigation

← Previous Change
Next Change →

Changeset 3149 for code/branches

Timestamp:

Jun 12, 2009, 10:17:44 AM (15 years ago)

Author:

rgrieder

Message:

Extracted OrxAssert from Exception.h to OrxAssert.h since it doesn't really have anything to do with exceptions.

Location:

code/branches/pch/src

Files:

: 1 added
: 24 edited

core/CommandLine.h (modified) (1 diff)
core/GameState.cc (modified) (1 diff)
core/XMLPort.h (modified) (1 diff)
orxonox/gamestates/GSClient.cc (modified) (1 diff)
orxonox/gamestates/GSRoot.cc (modified) (1 diff)
orxonox/gamestates/GSServer.cc (modified) (1 diff)
orxonox/objects/collisionshapes/CollisionShape.cc (modified) (1 diff)
orxonox/objects/collisionshapes/CompoundCollisionShape.cc (modified) (1 diff)
orxonox/objects/collisionshapes/WorldEntityCollisionShape.cc (modified) (1 diff)
orxonox/objects/quest/AddQuest.cc (modified) (1 diff)
orxonox/objects/quest/AddQuestHint.cc (modified) (1 diff)
orxonox/objects/quest/CompleteQuest.cc (modified) (1 diff)
orxonox/objects/quest/FailQuest.cc (modified) (1 diff)
orxonox/objects/quest/GlobalQuest.cc (modified) (1 diff)
orxonox/objects/quest/LocalQuest.cc (modified) (1 diff)
orxonox/objects/quest/QuestHint.cc (modified) (1 diff)
orxonox/objects/quest/QuestListener.cc (modified) (1 diff)
orxonox/objects/quest/QuestManager.cc (modified) (1 diff)
orxonox/objects/worldentities/Backlight.cc (modified) (1 diff)
orxonox/objects/worldentities/MobileEntity.cc (modified) (1 diff)
orxonox/objects/worldentities/StaticEntity.cc (modified) (1 diff)
orxonox/objects/worldentities/WorldEntity.cc (modified) (1 diff)
orxonox/objects/worldentities/pawns/SpaceShip.cc (modified) (1 diff)
util/Exception.h (modified) (1 diff)
util/OrxAssert.h (added)

Legend:

: Unmodified
: Added
: Removed

code/branches/pch/src/core/CommandLine.h

r2662	r3149
34	34	#include "util/Convert.h"
35	35	#include "util/Debug.h"
36		#include "util/~~Exception~~.h"
	36	#include "util/OrxAssert.h"
37	37	#include "util/MultiType.h"
38	38

code/branches/pch/src/core/GameState.cc

-                      r3084
+                      r3149
 #include "GameState.h"
-#include <cassert>
 #include "util/Debug.h"
 #include "util/Exception.h"
+#include "util/OrxAssert.h"
 #include "Clock.h"

code/branches/pch/src/core/XMLPort.h

r2896	r3149
47	47	#include "util/Debug.h"
48	48	#include "util/Exception.h"
	49	#include "util/OrxAssert.h"
49	50	#include "util/MultiType.h"
50	51	#include "XMLIncludes.h"

code/branches/pch/src/orxonox/gamestates/GSClient.cc

r3110	r3149
29	29	#include "GSClient.h"
30	30
	31	#include "util/Exception.h"
31	32	#include "core/input/InputManager.h"
32	33	#include "core/Clock.h"

code/branches/pch/src/orxonox/gamestates/GSRoot.cc

r3110	r3149
29	29	#include "GSRoot.h"
30	30
31		~~#include "util/Exception.h"~~
32	31	#include "util/Debug.h"
33	32	#include "core/Clock.h"

code/branches/pch/src/orxonox/gamestates/GSServer.cc

r3110	r3149
29	29	#include "GSServer.h"
30	30
	31	#include "util/Debug.h"
31	32	#include "core/CommandLine.h"
32	33	#include "core/Game.h"

code/branches/pch/src/orxonox/objects/collisionshapes/CollisionShape.cc

r3110	r3149
31	31	#include "BulletCollision/CollisionShapes/btCollisionShape.h"
32	32
33		~~#include "util/Exception.h"~~
34	33	#include "core/CoreIncludes.h"
35	34	#include "core/XMLPort.h"

code/branches/pch/src/orxonox/objects/collisionshapes/CompoundCollisionShape.cc

r3125	r3149
31	31	#include "BulletCollision/CollisionShapes/btCompoundShape.h"
32	32
33		~~#include "util/Exception.h"~~
34	33	#include "core/CoreIncludes.h"
35	34	#include "core/XMLPort.h"

code/branches/pch/src/orxonox/objects/collisionshapes/WorldEntityCollisionShape.cc

r3110	r3149
31	31	#include "BulletCollision/CollisionShapes/btCompoundShape.h"
32	32
33		#include "util/~~Exception~~.h"
	33	#include "util/OrxAssert.h"
34	34	#include "core/CoreIncludes.h"
35	35	#include "objects/worldentities/WorldEntity.h"

code/branches/pch/src/orxonox/objects/quest/AddQuest.cc

r3110	r3149
37	37
38	38	#include "core/CoreIncludes.h"
39		~~#include "util/Exception.h"~~
40	39
41	40	#include "orxonox/objects/infos/PlayerInfo.h"

code/branches/pch/src/orxonox/objects/quest/AddQuestHint.cc

r3110	r3149
35	35
36	36	#include "core/CoreIncludes.h"
37		~~#include "util/Exception.h"~~
38	37
39	38	#include "orxonox/objects/infos/PlayerInfo.h"

code/branches/pch/src/orxonox/objects/quest/CompleteQuest.cc

r3110	r3149
35	35
36	36	#include "core/CoreIncludes.h"
37		~~#include "util/Exception.h"~~
38	37
39	38	#include "orxonox/objects/infos/PlayerInfo.h"

code/branches/pch/src/orxonox/objects/quest/FailQuest.cc

r3110	r3149
35	35
36	36	#include "core/CoreIncludes.h"
37		~~#include "util/Exception.h"~~
38	37
39	38	#include "orxonox/objects/infos/PlayerInfo.h"

code/branches/pch/src/orxonox/objects/quest/GlobalQuest.cc

r3110	r3149
37	37	#include "core/CoreIncludes.h"
38	38	#include "core/Super.h"
39		~~#include "util/Exception.h"~~
40	39
41	40	#include "QuestEffect.h"

code/branches/pch/src/orxonox/objects/quest/LocalQuest.cc

r3110	r3149
36	36	#include "core/CoreIncludes.h"
37	37	#include "core/Super.h"
38		~~#include "util/Exception.h"~~
39	38
40	39	#include "orxonox/objects/infos/PlayerInfo.h"

code/branches/pch/src/orxonox/objects/quest/QuestHint.cc

r3110	r3149
35	35
36	36	#include "core/CoreIncludes.h"
37		~~#include "util/Exception.h"~~
38	37
39	38	#include "orxonox/objects/infos/PlayerInfo.h"

code/branches/pch/src/orxonox/objects/quest/QuestListener.cc

r3110	r3149
36	36	#include "core/CoreIncludes.h"
37	37	#include "core/XMLPort.h"
38		~~#include "util/Exception.h"~~
39	38
40	39	#include "Quest.h"

code/branches/pch/src/orxonox/objects/quest/QuestManager.cc

r3110	r3149
38	38	#include "core/input/InputManager.h"
39	39
40		~~#include "util/Exception.h"~~
41	40	#include "gui/GUIManager.h"
42	41	#include "objects/infos/PlayerInfo.h"

code/branches/pch/src/orxonox/objects/worldentities/Backlight.cc

r3110	r3149
37	37	#include "core/XMLPort.h"
38	38	#include "objects/Scene.h"
39		~~#include "util/Exception.h"~~
40	39
41	40	namespace orxonox

code/branches/pch/src/orxonox/objects/worldentities/MobileEntity.cc

r3110	r3149
34	34	#include "util/Debug.h"
35	35	#include "util/MathConvert.h"
36		~~#include "util/Exception.h"~~
37	36	#include "core/CoreIncludes.h"
38	37	#include "core/XMLPort.h"

code/branches/pch/src/orxonox/objects/worldentities/StaticEntity.cc

r3110	r3149
33	33	#include "BulletDynamics/Dynamics/btRigidBody.h"
34	34
35		#include "util/~~Exception~~.h"
	35	#include "util/OrxAssert.h"
36	36	#include "core/CoreIncludes.h"
37	37

code/branches/pch/src/orxonox/objects/worldentities/WorldEntity.cc

r3110	r3149
35	35	#include "BulletDynamics/Dynamics/btRigidBody.h"
36	36
37		#include "util/~~Exception~~.h"
	37	#include "util/OrxAssert.h"
38	38	#include "util/Convert.h"
39	39	#include "core/CoreIncludes.h"

code/branches/pch/src/orxonox/objects/worldentities/pawns/SpaceShip.cc

r3110	r3149
32	32
33	33	#include "util/Math.h"
34		~~#include "util/Exception.h"~~
35	34	#include "core/CoreIncludes.h"
36	35	#include "core/ConfigValueIncludes.h"

code/branches/pch/src/util/Exception.h

-                      r3068
+                      r3149
     throw InternalHandleException(type##Exception(description, __LINE__, __FILE__, __FUNCTIONNAME__))
-    // define an assert macro that can display a message
-#ifndef NDEBUG
-#define OrxAssert(Assertion, ErrorMessage) \
-    Assertion ? ((void)0) : (void)(orxonox::OutputHandler::getOutStream().setOutputLevel(ORX_ERROR) << ErrorMessage << std::endl); \
-    assert(Assertion)
-#else
-#define OrxAssert(condition, errorMessage)  ((void)0)
-#endif
 #endif /* _Exception_H__ */

Note: See TracChangeset for help on using the changeset viewer.

Context Navigation

Changeset 3149 for code/branches

Legend:

Download in other formats: