mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-16 18:19:55 +00:00
Code Issues Releases Wiki Activity

Merge pull request #2 from GrimKriegor/master

Browse source 
Ported OpenMW's "Don't use unordered_map" commit changes to TES3MP to fix #1
This commit is contained in:
Stanislav Zhukov 2016-07-12 04:02:52 -05:00 committed by GitHub
commit 1d5f0bd38f
3 changed files with 3 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
CMakeLists.txt
View file

@ -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)

10
apps/openmw/mwworld/worldimp.cpp
View file

@ -1,13 +1,5 @@
#include "worldimp.hpp"
#if defined(_WIN32) && !defined(__MINGW32__)
#include <boost/tr1/tr1/unordered_map>
#elif defined HAVE_UNORDERED_MAP
#include <unordered_map>
#else
#include <tr1/unordered_map>
#endif
#include <osg/Group>
#include <osg/ComputeBoundsVisitor>
@ -108,7 +100,7 @@ namespace MWWorld
}
private:
typedef std::tr1::unordered_map<std::string, ContentLoader*> LoadersContainer;
typedef std::map<std::string, ContentLoader*> LoadersContainer;
LoadersContainer mLoaders;
};

14
components/files/configurationmanager.hpp
View file

@ -1,13 +1,7 @@
#ifndef COMPONENTS_FILES_CONFIGURATIONMANAGER_HPP
#define COMPONENTS_FILES_CONFIGURATIONMANAGER_HPP
#if defined(_WIN32) && !defined(__MINGW32__)
#include <boost/tr1/tr1/unordered_map>
#elif defined HAVE_UNORDERED_MAP
#include <unordered_map>
#else
#include <tr1/unordered_map>
#endif
#include <map>
#include <boost/program_options.hpp>
@ -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<std::string, path_type_f> TokensMappingContainer;
#else
typedef std::tr1::unordered_map<std::string, path_type_f> TokensMappingContainer;
#endif
typedef std::map<std::string, path_type_f> TokensMappingContainer;
bool loadConfig(const boost::filesystem::path& path,
boost::program_options::variables_map& variables,