Changeset 890 for code/trunk/src/orxonox

Timestamp:

Mar 13, 2008, 3:52:29 PM (16 years ago)

Author:

rgrieder

Message:

• fixed several errors and issues with visual studio under windows:
  • moved tixml into a separate static lib (has to be)
  • updated OrxonoxStableHeaders.h
  • added macro for XOR
  • exported << operators
  • removed TiXMLPrereqs.h, not anymore useful; merged it into XMLIncludes.h

Location:

code/trunk/src/orxonox

Files:

• OrxonoxPlatform.h (modified) (1 diff)
• OrxonoxStableHeaders.h (modified) (1 diff)
• core/ClassTreeMask.cc (modified) (6 diffs)
• core/Identifier.h (modified) (1 diff)
• objects/Tickable.cc (modified) (1 diff)
• tools/Timer.cc (modified) (1 diff)

code/trunk/src/orxonox/OrxonoxPlatform.h

@@ -251 +251 @@
 #endif
 
+
+// Create a logical xor operator
+#if ORXONOX_COMPILER == ORXONOX_COMPILER_MSVC
+#  define XOR ^
+#elif ORXONOX_COMPILER == ORXONOX_COMPILER_GCC
+#  define XOR xor
+#else
+#  define XOR ^
+#endif
+
 } /* namespace orxonox */
 

code/trunk/src/orxonox/OrxonoxStableHeaders.h

@@ -87 +87 @@
 #include "util/String2Number.h"
 #include "util/Tokenizer.h"
+#include "util/Multitype.h"
+#include "util/MultiTypeMath.h"
+#include "util/MultiTypePrimitive.h"
+#include "util/MultiTypeString.h"
+#include "util/substring.h"
+#include "util/XMLIncludes.h"
+
 #include "util/tinyxml/ticpp.h"
 #include "util/tinyxml/tinyxml.h"

code/trunk/src/orxonox/core/ClassTreeMask.cc

@@ -592 +592 @@
         {
             const Identifier* subclass = it->getClass();
-            newmask.add(subclass, this->isIncluded(subclass) or other.isIncluded(subclass), false, false);
+            newmask.add(subclass, this->isIncluded(subclass) || other.isIncluded(subclass), false, false);
         }
 
@@ -599 +599 @@
         {
             const Identifier* subclass = it->getClass();
-            newmask.add(subclass, this->isIncluded(subclass) or other.isIncluded(subclass), false, false);
+            newmask.add(subclass, this->isIncluded(subclass) || other.isIncluded(subclass), false, false);
         }
 
@@ -623 +623 @@
         {
             const Identifier* subclass = it->getClass();
-            newmask.add(subclass, this->isIncluded(subclass) and other.isIncluded(subclass), false, false);
+            newmask.add(subclass, this->isIncluded(subclass) && other.isIncluded(subclass), false, false);
         }
 
@@ -630 +630 @@
         {
             const Identifier* subclass = it->getClass();
-            newmask.add(subclass, this->isIncluded(subclass) and other.isIncluded(subclass), false, false);
+            newmask.add(subclass, this->isIncluded(subclass) && other.isIncluded(subclass), false, false);
         }
 
@@ -737 +737 @@
         {
             const Identifier* subclass = it->getClass();
-            newmask.add(subclass, this->isIncluded(subclass) xor other.isIncluded(subclass), false, false);
+            newmask.add(subclass, this->isIncluded(subclass) XOR other.isIncluded(subclass), false, false);
         }
 
@@ -744 +744 @@
         {
             const Identifier* subclass = it->getClass();
-            newmask.add(subclass, this->isIncluded(subclass) xor other.isIncluded(subclass), false, false);
+            newmask.add(subclass, this->isIncluded(subclass) XOR other.isIncluded(subclass), false, false);
         }
 

code/trunk/src/orxonox/core/Identifier.h

@@ -206 +206 @@
     };
 
-    std::ostream& operator<<(std::ostream& out, const std::list<const Identifier*>& list);
+    _CoreExport std::ostream& operator<<(std::ostream& out, const std::list<const Identifier*>& list);
 
 

code/trunk/src/orxonox/objects/Tickable.cc

@@ +1 @@
+/*
+ *   ORXONOX - the hottest 3D action shooter ever to exist
+ *
+ *
+ *   License notice:
+ *
+ *   This program is free software; you can redistribute it and/or
+ *   modify it under the terms of the GNU General Public License
+ *   as published by the Free Software Foundation; either version 2
+ *   of the License, or (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ *   Author:
+ *      Fabian 'x3n' Landau
+ *   Co-authors:
+ *      ...
+ *
+ */
+
+#include "OrxonoxStableHeaders.h"
+
 #include "core/CoreIncludes.h"
 #include "Tickable.h"

code/trunk/src/orxonox/tools/Timer.cc

@@ +1 @@
+/*
+ *   ORXONOX - the hottest 3D action shooter ever to exist
+ *
+ *
+ *   License notice:
+ *
+ *   This program is free software; you can redistribute it and/or
+ *   modify it under the terms of the GNU General Public License
+ *   as published by the Free Software Foundation; either version 2
+ *   of the License, or (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ *   Author:
+ *      Fabian 'x3n' Landau
+ *   Co-authors:
+ *      ...
+ *
+ */
+
+#include "OrxonoxStableHeaders.h"
+
 #include "core/CoreIncludes.h"
 #include "Timer.h"