[Bf-blender-cvs] [db62a80] master: Libmv: Remove old workaround for 10.5 hash tables

[Sergey Sharybin]

Commit: db62a808692aafb4ed3282d1b2b76894a8b71d38
Author: Sergey Sharybin
Date:   Wed Oct 1 12:01:24 2014 +0600
Branches: master
https://developer.blender.org/rBdb62a808692aafb4ed3282d1b2b76894a8b71d38

Libmv: Remove old workaround for 10.5 hash tables

We on'don't really support 10.5 anymore for my knowledge and in any case
the defined symbol was never checked in the sources, so this workaround
was basically doing nothing for quite some time now.

===================================================================

M	extern/libmv/third_party/ceres/SConscript
M	extern/libmv/third_party/ceres/bundle.sh

===================================================================

diff --git a/extern/libmv/third_party/ceres/SConscript b/extern/libmv/third_party/ceres/SConscript
index 44869c8..f53d54b 100644
--- a/extern/libmv/third_party/ceres/SConscript
+++ b/extern/libmv/third_party/ceres/SConscript
@@ -52,11 +52,6 @@ if env['SHARED_PTR_NAMESPACE'] == 'std::tr1':
 
 incs = '. ../../ ../../../Eigen3 ./include ./internal ../gflags ./config'
 
-# work around broken hashtable in 10.5 SDK
-if env['OURPLATFORM'] == 'darwin' and env['WITH_BF_BOOST']:
-    incs += ' ' + env['BF_BOOST_INC']
-    defs.append('CERES_HASH_BOOST')
-
 if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc', 'win64-mingw'):
     if env['OURPLATFORM'] in ('win32-vc', 'win64-vc'):
         incs += ' ../msinttypes'
diff --git a/extern/libmv/third_party/ceres/bundle.sh b/extern/libmv/third_party/ceres/bundle.sh
index 0679840..51a463a 100755
--- a/extern/libmv/third_party/ceres/bundle.sh
+++ b/extern/libmv/third_party/ceres/bundle.sh
@@ -255,11 +255,6 @@ if env['SHARED_PTR_NAMESPACE'] == 'std::tr1':
 
 incs = '. ../../ ../../../Eigen3 ./include ./internal ../gflags ./config'
 
-# work around broken hashtable in 10.5 SDK
-if env['OURPLATFORM'] == 'darwin' and env['WITH_BF_BOOST']:
-    incs += ' ' + env['BF_BOOST_INC']
-    defs.append('CERES_HASH_BOOST')
-
 if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc', 'win64-mingw'):
     if env['OURPLATFORM'] in ('win32-vc', 'win64-vc'):
         incs += ' ../msinttypes'