Changeset 8373

Timestamp:

May 2, 2011, 5:00:20 AM (13 years ago)

Author:

rgrieder

Message:

Replaced code like
bool b = someFunction(); assert(b);
with
OrxVerify(someFunction(), "");
to remove warnings in release mode.

Location:

code/trunk/src/libraries

Files:

• core/ThreadPool.cc (modified) (4 diffs)
• network/GamestateManager.cc (modified) (4 diffs)
• network/packet/Gamestate.cc (modified) (2 diffs)

code/trunk/src/libraries/core/ThreadPool.cc

@@ -28 +28 @@
 
 #include "ThreadPool.h"
+
+#include "util/OrxAssert.h"
 #include "Thread.h"
-#include <cassert>
 
 namespace orxonox
@@ -40 +41 @@
     ThreadPool::~ThreadPool()
     {
-        unsigned int a = this->setNrOfThreads(0);
-        assert(a == 0);
+        OrxVerify(this->setNrOfThreads(0) == 0, "" );
     }
 
@@ -88 +88 @@
             if ( ! (*it)->isWorking() )
             {
-                bool b = (*it)->evaluateExecutor( executor );
-                assert(b); // if b is false then there is some code error
+                // If that fails, then there is some code error
+                OrxVerify( (*it)->evaluateExecutor( executor ), "" );
                 return true;
             }
@@ -96 +96 @@
         {
             addThreads( 1 );
-            bool b = this->threadPool_.back()->evaluateExecutor( executor ); // access the last element
-            assert(b);
+            OrxVerify( this->threadPool_.back()->evaluateExecutor( executor ), "" ); // access the last element
             return true;
         }

code/trunk/src/libraries/network/GamestateManager.cc

@@ -54 +54 @@
 #include "util/Debug.h"
 #include "util/Clock.h"
+#include "util/OrxAssert.h"
 // #include "TrafficControl.h"
 
@@ -108 +109 @@
     // now push only the most recent gamestates we received (ignore obsolete ones)
     for(it = gamestateQueue.begin(); it!=gamestateQueue.end(); it++){
-      bool b = processGamestate(it->second);
-      assert(b);
+      OrxVerify(processGamestate(it->second), "");
       sendAck( it->second->getID(), it->second->getPeerID() );
       delete it->second;
@@ -252 +252 @@
 
 
-//     bool b = gs->compressData();
-//     assert(b);
+//     OrxVerify(gs->compressData(), "");
     clock.capture();
     COUT(5) << "diff and compress time: " << clock.getDeltaTime() << endl;
@@ -363 +362 @@
     if(gs->isCompressed())
     {
-       bool b = gs->decompressData();
-       assert(b);
+       OrxVerify(gs->decompressData(), "");
     }
     assert(!gs->isDiffed());

code/trunk/src/libraries/network/packet/Gamestate.cc

@@ -32 +32 @@
 
 #include "util/Debug.h"
+#include "util/OrxAssert.h"
 #include "core/GameMode.h"
 #include "core/ObjectList.h"
@@ -201 +202 @@
     {
 //       COUT(4) << "updating object of classid " << objectheader.getClassID() << endl;
-      bool b = s->updateData(mem, mode);
-      assert(b);
+      OrxVerify(s->updateData(mem, mode), "");
     }
   }