Changeset 890 for code/trunk/src/orxonox/core

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/core

Files:

• ClassTreeMask.cc (modified) (6 diffs)
• Identifier.h (modified) (1 diff)

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);