[Orxonox-commit 2458] r7165 - in code/trunk/src/libraries: core util

[landauf at orxonox.net]

Author: landauf
Date: 2010-08-16 20:31:40 +0200 (Mon, 16 Aug 2010)
New Revision: 7165

Modified:
   code/trunk/src/libraries/core/TclThreadManager.cc
   code/trunk/src/libraries/util/MultiType.h
   code/trunk/src/libraries/util/SubString.cc
Log:
for some reason MinGW with gcc 4.5 needs some additional _UtilExport keywords
also fixed 2 warnings

Modified: code/trunk/src/libraries/core/TclThreadManager.cc
===================================================================
--- code/trunk/src/libraries/core/TclThreadManager.cc	2010-08-14 21:56:56 UTC (rev 7164)
+++ code/trunk/src/libraries/core/TclThreadManager.cc	2010-08-16 18:31:40 UTC (rev 7165)
@@ -620,7 +620,7 @@
         // Prepare the command-line arguments
         const int argc = 2;
         char* argv[argc];
-        argv[0] = "tclthread";
+        argv[0] = const_cast<char*>("tclthread");
         argv[1] = const_cast<char*>(file.c_str());
 
         // Start the Tcl-command Tcl_Main with the Tcl_OrxonoxAppInit hook

Modified: code/trunk/src/libraries/util/MultiType.h
===================================================================
--- code/trunk/src/libraries/util/MultiType.h	2010-08-14 21:56:56 UTC (rev 7164)
+++ code/trunk/src/libraries/util/MultiType.h	2010-08-16 18:31:40 UTC (rev 7165)
@@ -507,29 +507,29 @@
     template <> inline bool MultiType::convert<const orxonox::Radian&>()      { return this->convert<orxonox::Radian>();      } /** @brief Converts the current value to the given type. */
     template <> inline bool MultiType::convert<const orxonox::Degree&>()      { return this->convert<orxonox::Degree>();      } /** @brief Converts the current value to the given type. */
 
-    template <> void MultiType::createNewValueContainer(const char& value);
-    template <> void MultiType::createNewValueContainer(const unsigned char& value);
-    template <> void MultiType::createNewValueContainer(const short& value);
-    template <> void MultiType::createNewValueContainer(const unsigned short& value);
-    template <> void MultiType::createNewValueContainer(const int& value);
-    template <> void MultiType::createNewValueContainer(const unsigned int& value);
-    template <> void MultiType::createNewValueContainer(const long& value);
-    template <> void MultiType::createNewValueContainer(const unsigned long& value);
-    template <> void MultiType::createNewValueContainer(const long long& value);
-    template <> void MultiType::createNewValueContainer(const unsigned long long& value);
-    template <> void MultiType::createNewValueContainer(const float& value);
-    template <> void MultiType::createNewValueContainer(const double& value);
-    template <> void MultiType::createNewValueContainer(const bool& value);
-    template <> void MultiType::createNewValueContainer(const long double& value);
-    template <> void MultiType::createNewValueContainer(      void* const& value);
-    template <> void MultiType::createNewValueContainer(const std::string& value);
-    template <> void MultiType::createNewValueContainer(const orxonox::Vector2& value);
-    template <> void MultiType::createNewValueContainer(const orxonox::Vector3& value);
-    template <> void MultiType::createNewValueContainer(const orxonox::Vector4& value);
-    template <> void MultiType::createNewValueContainer(const orxonox::ColourValue& value);
-    template <> void MultiType::createNewValueContainer(const orxonox::Quaternion& value);
-    template <> void MultiType::createNewValueContainer(const orxonox::Radian& value);
-    template <> void MultiType::createNewValueContainer(const orxonox::Degree& value);
+    template <> _UtilExport void MultiType::createNewValueContainer(const char& value);
+    template <> _UtilExport void MultiType::createNewValueContainer(const unsigned char& value);
+    template <> _UtilExport void MultiType::createNewValueContainer(const short& value);
+    template <> _UtilExport void MultiType::createNewValueContainer(const unsigned short& value);
+    template <> _UtilExport void MultiType::createNewValueContainer(const int& value);
+    template <> _UtilExport void MultiType::createNewValueContainer(const unsigned int& value);
+    template <> _UtilExport void MultiType::createNewValueContainer(const long& value);
+    template <> _UtilExport void MultiType::createNewValueContainer(const unsigned long& value);
+    template <> _UtilExport void MultiType::createNewValueContainer(const long long& value);
+    template <> _UtilExport void MultiType::createNewValueContainer(const unsigned long long& value);
+    template <> _UtilExport void MultiType::createNewValueContainer(const float& value);
+    template <> _UtilExport void MultiType::createNewValueContainer(const double& value);
+    template <> _UtilExport void MultiType::createNewValueContainer(const bool& value);
+    template <> _UtilExport void MultiType::createNewValueContainer(const long double& value);
+    template <> _UtilExport void MultiType::createNewValueContainer(      void* const& value);
+    template <> _UtilExport void MultiType::createNewValueContainer(const std::string& value);
+    template <> _UtilExport void MultiType::createNewValueContainer(const orxonox::Vector2& value);
+    template <> _UtilExport void MultiType::createNewValueContainer(const orxonox::Vector3& value);
+    template <> _UtilExport void MultiType::createNewValueContainer(const orxonox::Vector4& value);
+    template <> _UtilExport void MultiType::createNewValueContainer(const orxonox::ColourValue& value);
+    template <> _UtilExport void MultiType::createNewValueContainer(const orxonox::Quaternion& value);
+    template <> _UtilExport void MultiType::createNewValueContainer(const orxonox::Radian& value);
+    template <> _UtilExport void MultiType::createNewValueContainer(const orxonox::Degree& value);
 
     inline bool MultiType::setValue(const char& value)                  { if (this->value_) { return this->value_->setValue(value); } else { return this->assignValue(value); } } /** @brief Assigns the given value and converts it to the current type. */
     inline bool MultiType::setValue(const unsigned char& value)         { if (this->value_) { return this->value_->setValue(value); } else { return this->assignValue(value); } } /** @brief Assigns the given value and converts it to the current type. */

Modified: code/trunk/src/libraries/util/SubString.cc
===================================================================
--- code/trunk/src/libraries/util/SubString.cc	2010-08-14 21:56:56 UTC (rev 7164)
+++ code/trunk/src/libraries/util/SubString.cc	2010-08-16 18:31:40 UTC (rev 7165)
@@ -553,7 +553,7 @@
      */
     void SubString::debug() const
     {
-        printf("Substring-information::count=%zd ::", this->strings.size());
+        printf("Substring-information::count=%d ::", this->strings.size());
         for (unsigned int i = 0; i < this->strings.size(); i++)
             printf("s%d='%s'::", i, this->strings[i].c_str());
         printf("\n");