Changeset 729 for code/branches/FICN/src/orxonox/core

Timestamp:

Dec 30, 2007, 9:48:52 PM (17 years ago)

Author:

rgrieder

Message:

• fixed multiple template instantiation problem under windows
• removed some warnings by introducing explicit casts

Location:

code/branches/FICN/src/orxonox/core

Files:

• CoreIncludes.h (modified) (1 diff)
• DebugLevel.cc (modified) (1 diff)
• DebugLevel.h (modified) (2 diffs)
• Identifier.h (modified) (1 diff)
• Language.cc (modified) (2 diffs)
• Language.h (modified) (2 diffs)
• ObjectList.h (modified) (1 diff)
• OrxonoxClass.h (modified) (2 diffs)

code/branches/FICN/src/orxonox/core/CoreIncludes.h

@@ -88 +88 @@
 
 /**
+    @brief Exports the necessary templates in order to make them available to all libraries.
+    @param ClassName The name of the Class
+    @param LibraryName The name of the Library
+*/
+#define ExportClass(ClassName, LibraryName) \
+    template class _##LibraryName##Export orxonox::ClassIdentifier<ClassName>; \
+    template class _##LibraryName##Export orxonox::ObjectList<ClassName>; \
+    template class _##LibraryName##Export orxonox::ClassFactory<ClassName>
+
+/**
+    @brief Exports the necessary templates in order to make them available to all libraries.
+    @param ClassName The name of the Class
+    @param LibraryName The name of the Library
+*/
+#define ExportAbstractClass(ClassName, LibraryName) \
+    template class _##LibraryName##Export orxonox::ClassIdentifier<ClassName>; \
+    template class _##LibraryName##Export orxonox::ObjectList<ClassName>
+
+/**
     @brief Returns the Identifier of the given class.
     @param ClassName The name of the class

code/branches/FICN/src/orxonox/core/DebugLevel.cc

@@ -31 +31 @@
 */
 
-#include "CoreIncludes.h"
 #include "DebugLevel.h"
 

code/branches/FICN/src/orxonox/core/DebugLevel.h

@@ -41 +41 @@
 #include "OrxonoxClass.h"
 #include "OutputHandler.h"
+#include "CoreIncludes.h"
 
 namespace orxonox
@@ -62 +63 @@
             ConfigValueContainer* softDebugLevelContainer_; //!< The config value container for the debug level
     };
+    ExportAbstractClass(DebugLevel, Core);
 }
 

code/branches/FICN/src/orxonox/core/Identifier.h

@@ -54 +54 @@
 #include <map>
 #include <string>
+#include <utility>
 
 #include "CorePrereqs.h"

code/branches/FICN/src/orxonox/core/Language.cc

@@ -245 +245 @@
             if (lineString.compare("") != 0)
             {
-                unsigned int pos = lineString.find('=');
+                unsigned int pos = (unsigned int)lineString.find('=');
 
                 // Check if the length is at least 3 and if there's an entry before and behind the =
@@ -288 +288 @@
             if (lineString.compare("") != 0)
             {
-                unsigned int pos = lineString.find('=');
+                unsigned int pos = (unsigned int)lineString.find('=');
 
                 // Check if the length is at least 3 and if there's an entry before and behind the =

code/branches/FICN/src/orxonox/core/Language.h

@@ -82 +82 @@
             bool bTranslationSet_;                                  //!< True if the translation was set
     };
+    template class _CoreExport orxonox::ClassIdentifier<LanguageEntry>;
+    template class _CoreExport orxonox::ObjectList<LanguageEntry>;
 
     //! The Language class manges the language files and entries and stores the LanguageEntry objects in a map.
@@ -108 +110 @@
             std::map<std::string, LanguageEntry*> languageEntries_; //!< A map to store all LanguageEntry objects and their name
     };
+    template class _CoreExport orxonox::ClassIdentifier<Language>;
+    template class _CoreExport orxonox::ObjectList<Language>;
 }
 

code/branches/FICN/src/orxonox/core/ObjectList.h

@@ -39 +39 @@
 
 #include "CorePrereqs.h"
+#include "Iterator.h"
 
 namespace orxonox

code/branches/FICN/src/orxonox/core/OrxonoxClass.h

@@ -41 +41 @@
 #include "CorePrereqs.h"
 #include "MetaObjectList.h"
-#include "Identifier.h"
+#include "Iterator.h"
 
 namespace orxonox
@@ -158 +158 @@
             bool bVisible_;                 //!< True = the object is visible
     };
+    template class _CoreExport orxonox::ClassIdentifier<OrxonoxClass>;
+    template class _CoreExport orxonox::ObjectList<OrxonoxClass>;
 }