Changeset 7165 for code/trunk/src

Timestamp:

Aug 16, 2010, 8:31:40 PM (14 years ago)

Author:

landauf

Message:

for some reason MinGW with gcc 4.5 needs some additional _UtilExport keywords
also fixed 2 warnings

Location:

code/trunk/src/libraries

Files:

• core/TclThreadManager.cc (modified) (1 diff)
• util/MultiType.h (modified) (1 diff)
• util/SubString.cc (modified) (1 diff)

code/trunk/src/libraries/core/TclThreadManager.cc

@@ -621 +621 @@
         const int argc = 2;
         char* argv[argc];
-        argv[0] = "tclthread";
+        argv[0] = const_cast<char*>("tclthread");
         argv[1] = const_cast<char*>(file.c_str());
 

code/trunk/src/libraries/util/MultiType.h

@@ -508 +508 @@
     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. */

code/trunk/src/libraries/util/SubString.cc

@@ -554 +554 @@
     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());