Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2014-07-10 00:19:41 +0400
committerSergey Sharybin <sergey.vfx@gmail.com>2014-07-10 00:19:41 +0400
commit2788d5f38565695cd4beba6b062206d202d13f51 (patch)
treea0a088c88a8072cfbbe1326aa99d1c5856431007 /build_files
parent6b5384f637b2d5a7a5943499ab96ab9a976c2052 (diff)
Attempt to fix compilation error on 32bit OSX and SCons
Diffstat (limited to 'build_files')
-rw-r--r--build_files/scons/Modules/FindSharedPtr.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/build_files/scons/Modules/FindSharedPtr.py b/build_files/scons/Modules/FindSharedPtr.py
index 848431f8271..ba53f55d563 100644
--- a/build_files/scons/Modules/FindSharedPtr.py
+++ b/build_files/scons/Modules/FindSharedPtr.py
@@ -15,11 +15,11 @@ def FindSharedPtr(conf):
# order to support this, we do an extra check to see which namespace
# should be used.
- if conf.CheckType('std::shared_ptr<int>', language = 'CXX', includes="#include <memory>"):
+ if conf.CheckType('std::shared_ptr<int>', language = 'C++', includes="#include <memory>"):
print("-- Found shared_ptr in std namespace using <memory> header.")
namespace = 'std'
header = 'memory'
- elif conf.CheckType('std::tr1::shared_ptr<int>', language = 'CXX', includes="#include <memory>"):
+ elif conf.CheckType('std::tr1::shared_ptr<int>', language = 'C++', includes="#include <memory>"):
print("-- Found shared_ptr in std::tr1 namespace using <memory> header..")
namespace = 'std::tr1'
header = 'memory'
@@ -29,7 +29,7 @@ def FindSharedPtr(conf):
# <tr1/memory> is to be included for this. And what makes things
# even more tricky is that gcc does have <memory> header, so
# all the checks above wouldn't find shared_ptr.
- if conf.CheckType('std::tr1::shared_ptr<int>', language = 'CXX', includes="#include <tr1/memory>"):
+ if conf.CheckType('std::tr1::shared_ptr<int>', language = 'C++', includes="#include <tr1/memory>"):
print("-- Found shared_ptr in std::tr1 namespace using <tr1/memory> header..")
namespace = 'std::tr1'
header = 'tr1/memory'