[Bf-blender-cvs] [2788d5f] master: Attempt to fix compilation error on 32bit OSX and SCons

[Sergey Sharybin]

Commit: 2788d5f38565695cd4beba6b062206d202d13f51
Author: Sergey Sharybin
Date:   Thu Jul 10 02:19:41 2014 +0600
https://developer.blender.org/rB2788d5f38565695cd4beba6b062206d202d13f51

Attempt to fix compilation error on 32bit OSX and SCons

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

M	build_files/scons/Modules/FindSharedPtr.py

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

diff --git a/build_files/scons/Modules/FindSharedPtr.py b/build_files/scons/Modules/FindSharedPtr.py
index 848431f..ba53f55 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'