diff --git a/CMakeLists.txt b/CMakeLists.txt index 143e03b90..adec45b60 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -209,12 +209,6 @@ if(NOT HAVE_STDINT_H) message(FATAL_ERROR "stdint.h was not found" ) endif() -include (CheckIncludeFileCXX) -check_include_file_cxx(unordered_map HAVE_UNORDERED_MAP) -if (HAVE_UNORDERED_MAP) - add_definitions(-DHAVE_UNORDERED_MAP) -endif () - set(BOOST_COMPONENTS system filesystem program_options thread) if(WIN32) diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp index 15826009d..95ded9a97 100644 --- a/apps/openmw/mwworld/worldimp.cpp +++ b/apps/openmw/mwworld/worldimp.cpp @@ -1,13 +1,5 @@ #include "worldimp.hpp" -#if defined(_WIN32) && !defined(__MINGW32__) -#include -#elif defined HAVE_UNORDERED_MAP -#include -#else -#include -#endif - #include #include @@ -108,7 +100,7 @@ namespace MWWorld } private: - typedef std::tr1::unordered_map LoadersContainer; + typedef std::map LoadersContainer; LoadersContainer mLoaders; }; diff --git a/components/files/configurationmanager.hpp b/components/files/configurationmanager.hpp index 58ee5c1ae..c05dbbb45 100644 --- a/components/files/configurationmanager.hpp +++ b/components/files/configurationmanager.hpp @@ -1,13 +1,7 @@ #ifndef COMPONENTS_FILES_CONFIGURATIONMANAGER_HPP #define COMPONENTS_FILES_CONFIGURATIONMANAGER_HPP -#if defined(_WIN32) && !defined(__MINGW32__) -#include -#elif defined HAVE_UNORDERED_MAP -#include -#else -#include -#endif +#include #include @@ -52,11 +46,7 @@ struct ConfigurationManager typedef Files::FixedPath<> FixedPathType; typedef const boost::filesystem::path& (FixedPathType::*path_type_f)() const; - #if defined HAVE_UNORDERED_MAP - typedef std::unordered_map TokensMappingContainer; - #else - typedef std::tr1::unordered_map TokensMappingContainer; - #endif + typedef std::map TokensMappingContainer; bool loadConfig(const boost::filesystem::path& path, boost::program_options::variables_map& variables,