oss/luanti
oss/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-06-27 16:36:03 +00:00
Code Wiki Activity

C++11 patchset 2: remove util/cpp11.h and util/cpp11_container.h (#5821)

Browse source
This commit is contained in:
Loïc Blot 2017-06-04 21:00:04 +02:00 • committed by GitHub
parent 2362d3f926
commit a98baef5e4
59 changed files with 223 additions and 298 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/settings.h
View file

@ -24,7 +24,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "util/string.h"
#include "threading/mutex.h"
#include <string>
#include "util/cpp11_container.h"
#include <list>
#include <set>
@ -45,7 +44,7 @@ typedef std::vector<
>
> SettingsCallbackList;
typedef UNORDERED_MAP<std::string, SettingsCallbackList> SettingsCallbackMap;
typedef std::unordered_map<std::string, SettingsCallbackList> SettingsCallbackMap;
enum ValueType {
VALUETYPE_STRING,
@ -95,7 +94,7 @@ struct SettingsEntry {
bool is_group;
};
typedef UNORDERED_MAP<std::string, SettingsEntry> SettingEntries;
typedef std::unordered_map<std::string, SettingsEntry> SettingEntries;
class Settings {
public: