[Orxonox-commit 3720] r8400 - code/trunk/src/libraries/util

rgrieder at orxonox.net rgrieder at orxonox.net
Wed May 4 04:49:20 CEST 2011


Author: rgrieder
Date: 2011-05-04 04:49:20 +0200 (Wed, 04 May 2011)
New Revision: 8400

Modified:
   code/trunk/src/libraries/util/Math.cc
   code/trunk/src/libraries/util/mbool.h
Log:
Removed strange hack. Extensive tests while watching Top Gear have revealed that it isn't necessary anymore.

Modified: code/trunk/src/libraries/util/Math.cc
===================================================================
--- code/trunk/src/libraries/util/Math.cc	2011-05-04 02:01:02 UTC (rev 8399)
+++ code/trunk/src/libraries/util/Math.cc	2011-05-04 02:49:20 UTC (rev 8400)
@@ -37,8 +37,6 @@
 
 #include "MathConvert.h"
 #include "SubString.h"
-// Do not remove this include, it avoids linker errors.
-#include "mbool.h"
 
 namespace orxonox
 {

Modified: code/trunk/src/libraries/util/mbool.h
===================================================================
--- code/trunk/src/libraries/util/mbool.h	2011-05-04 02:01:02 UTC (rev 8399)
+++ code/trunk/src/libraries/util/mbool.h	2011-05-04 02:49:20 UTC (rev 8400)
@@ -55,7 +55,7 @@
         changes. On the other hand, if you want to change the state, you can simply increase
         the counter.
     */
-    struct _UtilExport mbool
+    struct mbool
     {
         public:
             /// Constructor: Creates the mbool and initializes the boolean value (default to false).
@@ -64,6 +64,9 @@
             /// Copy-constructor, copies state and memory.
             inline mbool(const mbool& value)
                 { this->value_.memory_ = value.value_.memory_; }
+            /// Destructor does nothing but not defining it might create a symbol (class is header only)
+            inline ~mbool()
+                { }
 
             /// Assigns a boolean value (and increases the memory value if the value is different to the old value).
             inline mbool& operator=(bool value)




More information about the Orxonox-commit mailing list