diff options
| author | Loic Blot <loic.blot@unix-experience.fr> | 2017-05-26 17:03:46 +0200 |
|---|---|---|
| committer | Loïc Blot <nerzhul@users.noreply.github.com> | 2017-06-04 09:57:08 +0200 |
| commit | bf6569b57019d070246d947ed929cb2b5eb67faf (patch) | |
| tree | 3a8a3d4858f20a57930e0a0d0ad1f7c3fb48b512 /src/nameidmapping.h | |
| parent | 0e58168fe5bce607f64805b854420e7558372f24 (diff) | |
| download | minetest-bf6569b57019d070246d947ed929cb2b5eb67faf.tar.gz minetest-bf6569b57019d070246d947ed929cb2b5eb67faf.tar.bz2 minetest-bf6569b57019d070246d947ed929cb2b5eb67faf.zip | |
Minetest for C++11 (CMakeLists + Travis)
* Move GCC to GCC 6 & GCC 7
* Move Clang to Clang 3.6 & Clang 4.0
* LINT moves from Clang 3.9 to Clang 4.0
* Move XCode 7.3 to 8.0
* Use more travis tricks to install compilers instead of adding complexity to our build script
* Clang format fixes on checked files (compat Cpp11 instead of Cpp03)
* Mingw GCC update from 4.8.4 to 5.3 (Ubuntu Xenial)
* Drop mingw cmake generated files and add them to gitignore
Diffstat (limited to 'src/nameidmapping.h')
| -rw-r--r-- | src/nameidmapping.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/nameidmapping.h b/src/nameidmapping.h index a2f3a3062..be353327d 100644 --- a/src/nameidmapping.h +++ b/src/nameidmapping.h @@ -80,6 +80,7 @@ public: return true; } u16 size() const { return m_id_to_name.size(); } + private: UNORDERED_MAP<u16, std::string> m_id_to_name; UNORDERED_MAP<std::string, u16> m_name_to_id; |