Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 7165 for code/trunk


Ignore:
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:
3 edited

Legend:

Unmodified
Added
Removed
  • code/trunk/src/libraries/core/TclThreadManager.cc

    r6417 r7165  
    621621        const int argc = 2;
    622622        char* argv[argc];
    623         argv[0] = "tclthread";
     623        argv[0] = const_cast<char*>("tclthread");
    624624        argv[1] = const_cast<char*>(file.c_str());
    625625
  • code/trunk/src/libraries/util/MultiType.h

    r6417 r7165  
    508508    template <> inline bool MultiType::convert<const orxonox::Degree&>()      { return this->convert<orxonox::Degree>();      } /** @brief Converts the current value to the given type. */
    509509
    510     template <> void MultiType::createNewValueContainer(const char& value);
    511     template <> void MultiType::createNewValueContainer(const unsigned char& value);
    512     template <> void MultiType::createNewValueContainer(const short& value);
    513     template <> void MultiType::createNewValueContainer(const unsigned short& value);
    514     template <> void MultiType::createNewValueContainer(const int& value);
    515     template <> void MultiType::createNewValueContainer(const unsigned int& value);
    516     template <> void MultiType::createNewValueContainer(const long& value);
    517     template <> void MultiType::createNewValueContainer(const unsigned long& value);
    518     template <> void MultiType::createNewValueContainer(const long long& value);
    519     template <> void MultiType::createNewValueContainer(const unsigned long long& value);
    520     template <> void MultiType::createNewValueContainer(const float& value);
    521     template <> void MultiType::createNewValueContainer(const double& value);
    522     template <> void MultiType::createNewValueContainer(const bool& value);
    523     template <> void MultiType::createNewValueContainer(const long double& value);
    524     template <> void MultiType::createNewValueContainer(      void* const& value);
    525     template <> void MultiType::createNewValueContainer(const std::string& value);
    526     template <> void MultiType::createNewValueContainer(const orxonox::Vector2& value);
    527     template <> void MultiType::createNewValueContainer(const orxonox::Vector3& value);
    528     template <> void MultiType::createNewValueContainer(const orxonox::Vector4& value);
    529     template <> void MultiType::createNewValueContainer(const orxonox::ColourValue& value);
    530     template <> void MultiType::createNewValueContainer(const orxonox::Quaternion& value);
    531     template <> void MultiType::createNewValueContainer(const orxonox::Radian& value);
    532     template <> void MultiType::createNewValueContainer(const orxonox::Degree& value);
     510    template <> _UtilExport void MultiType::createNewValueContainer(const char& value);
     511    template <> _UtilExport void MultiType::createNewValueContainer(const unsigned char& value);
     512    template <> _UtilExport void MultiType::createNewValueContainer(const short& value);
     513    template <> _UtilExport void MultiType::createNewValueContainer(const unsigned short& value);
     514    template <> _UtilExport void MultiType::createNewValueContainer(const int& value);
     515    template <> _UtilExport void MultiType::createNewValueContainer(const unsigned int& value);
     516    template <> _UtilExport void MultiType::createNewValueContainer(const long& value);
     517    template <> _UtilExport void MultiType::createNewValueContainer(const unsigned long& value);
     518    template <> _UtilExport void MultiType::createNewValueContainer(const long long& value);
     519    template <> _UtilExport void MultiType::createNewValueContainer(const unsigned long long& value);
     520    template <> _UtilExport void MultiType::createNewValueContainer(const float& value);
     521    template <> _UtilExport void MultiType::createNewValueContainer(const double& value);
     522    template <> _UtilExport void MultiType::createNewValueContainer(const bool& value);
     523    template <> _UtilExport void MultiType::createNewValueContainer(const long double& value);
     524    template <> _UtilExport void MultiType::createNewValueContainer(      void* const& value);
     525    template <> _UtilExport void MultiType::createNewValueContainer(const std::string& value);
     526    template <> _UtilExport void MultiType::createNewValueContainer(const orxonox::Vector2& value);
     527    template <> _UtilExport void MultiType::createNewValueContainer(const orxonox::Vector3& value);
     528    template <> _UtilExport void MultiType::createNewValueContainer(const orxonox::Vector4& value);
     529    template <> _UtilExport void MultiType::createNewValueContainer(const orxonox::ColourValue& value);
     530    template <> _UtilExport void MultiType::createNewValueContainer(const orxonox::Quaternion& value);
     531    template <> _UtilExport void MultiType::createNewValueContainer(const orxonox::Radian& value);
     532    template <> _UtilExport void MultiType::createNewValueContainer(const orxonox::Degree& value);
    533533
    534534    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

    r6417 r7165  
    554554    void SubString::debug() const
    555555    {
    556         printf("Substring-information::count=%zd ::", this->strings.size());
     556        printf("Substring-information::count=%d ::", this->strings.size());
    557557        for (unsigned int i = 0; i < this->strings.size(); i++)
    558558            printf("s%d='%s'::", i, this->strings[i].c_str());
Note: See TracChangeset for help on using the changeset viewer.