diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-05-02 03:52:56 +0400 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-06-27 12:08:27 +0400 |
commit | 72ac596e19ddb37636e107635b52ee78888460e7 (patch) | |
tree | 5b94775ba0528366a07114c8d47859f485c725e0 /build_files/scons/tools | |
parent | 0a0e4e0e698eb496c4fb18c79b532104581ce0af (diff) |
Update Ceres to latest upstream version
Brings new bounds limiting and also prepares build system
for the changes in the upstream.
Namely shared_ptr header and namespace is now being detected
by a build system rather than by hacks in the code.
This commit includes some changes to auto-detection flags
in SCons, presumably adding more consistency there. This
is main changes which are suppoed to be reviewed here.
Reviewers: campbellbarton
Differential Revision: https://developer.blender.org/D581
Diffstat (limited to 'build_files/scons/tools')
-rw-r--r-- | build_files/scons/tools/unordered_map.py | 32 |
1 files changed, 0 insertions, 32 deletions
diff --git a/build_files/scons/tools/unordered_map.py b/build_files/scons/tools/unordered_map.py deleted file mode 100644 index d314a777b0c..00000000000 --- a/build_files/scons/tools/unordered_map.py +++ /dev/null @@ -1,32 +0,0 @@ -def test_unordered_map(conf): - """ - Detect unordered_map availability - - Returns (True/False, namespace, include prefix) - """ - - if conf.CheckCXXHeader("unordered_map"): - # Even so we've found unordered_map header file it doesn't - # mean unordered_map and unordered_set will be declared in - # std namespace. - # - # Namely, MSVC 2008 have unordered_map header which declares - # unordered_map class in std::tr1 namespace. In order to support - # this, we do extra check to see which exactly namespace is - # to be used. - - if conf.CheckType('std::unordered_map<int, int>', language = 'CXX', includes="#include <unordered_map>"): - print("-- Found unordered_map/set in std namespace.") - return True, 'std', '' - elif conf.CheckType('std::tr1::unordered_map<int, int>', language = 'CXX', includes="#include <unordered_map>"): - print("-- Found unordered_map/set in std::tr1 namespace.") - return True, 'std::tr1', '' - else: - print("-- Found <unordered_map> but can not find neither std::unordered_map nor std::tr1::unordered_map.") - return False, '', '' - elif conf.CheckCXXHeader("tr1/unordered_map"): - print("-- Found unordered_map/set in std::tr1 namespace.") - return True, 'std::tr1', 'tr1/' - else: - print("-- Unable to find <unordered_map> or <tr1/unordered_map>. ") - return False, '', '' |