diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-07-25 17:59:46 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-07-30 18:12:24 +0300 |
| commit | 885cc4cf9a1d5c167e4cbd26c3294d8b1ad400d8 (patch) | |
| tree | cb7f2b6ef98c6ce346f2378096bc9d32a3e5606e /source/blender/alembic | |
| parent | b59d85b5a56c020c7b86b0cca4dc38e4950550f9 (diff) | |
Build: require C11/C++11 for all operating systems in master.
This is in preparation of upgrading our library dependencies, some of which
need C++11. We already use C++11 in blender2.8 and for Windows and macOS, so
this just affects Linux.
On many distributions this will not require any changes, on some
install_deps.sh will need to be run again to rebuild libraries.
Differential Revision: https://developer.blender.org/D3568
Diffstat (limited to 'source/blender/alembic')
| -rw-r--r-- | source/blender/alembic/intern/abc_customdata.cc | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/source/blender/alembic/intern/abc_customdata.cc b/source/blender/alembic/intern/abc_customdata.cc index 87545007870..f2ae1c831d1 100644 --- a/source/blender/alembic/intern/abc_customdata.cc +++ b/source/blender/alembic/intern/abc_customdata.cc @@ -26,14 +26,7 @@ #include <Alembic/AbcGeom/All.h> #include <algorithm> - -#if (__cplusplus > 199711L) || (defined(_MSC_VER) && _MSC_VER >= 1900) #include <unordered_map> -typedef std::unordered_map<uint64_t, int> uv_index_map; -#else -#include <map> -typedef std::map<uint64_t, int> uv_index_map; -#endif extern "C" { #include "DNA_customdata_types.h" @@ -60,6 +53,8 @@ using Alembic::AbcGeom::OV2fGeomParam; using Alembic::AbcGeom::OC4fGeomParam; +typedef std::unordered_map<uint64_t, int> uv_index_map; + static inline uint64_t uv_to_hash_key(Imath::V2f v) { /* Convert -0.0f to 0.0f, so bitwise comparison works. */ |