Changeset 893 for code/branches/input/src/util

Timestamp:

Mar 13, 2008, 4:15:41 PM (16 years ago)

Author:

rgrieder

Message:

• merged trunk into input

Location:

code/branches/input/src/util

Files:

• Math.h (modified) (1 diff)
• MultiTypeMath.h (modified) (1 diff)
• MultiTypePrimitive.h (modified) (1 diff)
• MultiTypeString.h (modified) (1 diff)
• XMLIncludes.h (modified) (1 diff)
• tinyxml/TinyXMLPrereqs.h (deleted)

code/branches/input/src/util/Math.h

@@ -147 +147 @@
 
 #endif /* _Math_H__ */
+

code/branches/input/src/util/MultiTypeMath.h

@@ -153 +153 @@
 };
 
-std::ostream& operator<<(std::ostream& out, MultiTypeMath& mtm);
+_UtilExport std::ostream& operator<<(std::ostream& out, MultiTypeMath& mtm);
 
 #endif /* _MultiTypeMath_H__ */

code/branches/input/src/util/MultiTypePrimitive.h

@@ -175 +175 @@
 };
 
-std::ostream& operator<<(std::ostream& out, const MultiTypePrimitive& mtp);
+_UtilExport std::ostream& operator<<(std::ostream& out, const MultiTypePrimitive& mtp);
 
 #endif /* _MultiTypePrimitive_H__ */

code/branches/input/src/util/MultiTypeString.h

@@ -109 +109 @@
 };
 
-std::ostream& operator<<(std::ostream& out, MultiTypeString& mts);
+_UtilExport std::ostream& operator<<(std::ostream& out, MultiTypeString& mts);
 
 #endif /* _MultiTypeString_H__ */

code/branches/input/src/util/XMLIncludes.h

@@ -1 @@
-#include "util/tinyxml/TinyXMLPrereqs.h"
+//-----------------------------------------------------------------------
+// Forward declarations
+//-----------------------------------------------------------------------
+
+class TiXmlString;
+class TiXmlOutStream;
+class TiXmlNode;
+class TiXmlHandle;
+class TiXmlDocument;
+class TiXmlElement;
+class TiXmlComment;
+class TiXmlUnknown;
+class TiXmlAttribute;
+class TiXmlText;
+class TiXmlDeclaration;
+class TiXmlParsingData;
+
+namespace ticpp
+{
+    class Document;
+    class Element;
+    class Declaration;
+    class StylesheetReference;
+    class Text;
+    class Comment;
+    class Attribute;
+}
 
 namespace orxonox