From 5d25bbee44cda24b61188ab2fa1a892824b55f40 Mon Sep 17 00:00:00 2001 From: Peter Foley Date: Thu, 16 Aug 2012 15:38:00 -0400 Subject: fix sal build with vs2012 Change-Id: Ia03980d5d890de7db1e606409a646a5a4f79e91e --- boost/boost.vc2012.patch | 14 ++++++++++++++ boost/makefile.mk | 1 + 2 files changed, 15 insertions(+) create mode 100644 boost/boost.vc2012.patch (limited to 'boost') diff --git a/boost/boost.vc2012.patch b/boost/boost.vc2012.patch new file mode 100644 index 000000000000..146ac0942b4d --- /dev/null +++ b/boost/boost.vc2012.patch @@ -0,0 +1,14 @@ +--- misc/build/boost_1_44_0/boost/config/compiler/visualc.hpp ++++ misc/build/boost_1_44_0/boost/config/compiler/visualc.hpp +@@ -101,6 +101,11 @@ + # define BOOST_NO_ADL_BARRIER + #endif + ++#if _MSC_VER >= 1700 // 1700 == VC++ 11.0 ++ // Removed in VC11: ++# define BOOST_NO_0X_HDR_INITIALIZER_LIST ++#endif ++ + + #if (_MSC_VER <= 1600) + // MSVC (including the latest checked version) has not yet completely diff --git a/boost/makefile.mk b/boost/makefile.mk index 5ce795f1e7fe..6a3a7b015b55 100644 --- a/boost/makefile.mk +++ b/boost/makefile.mk @@ -69,6 +69,7 @@ PATCH_FILES+=boost.6397.warnings.patch PATCH_FILES+=boost.mipsbackport.patch PATCH_FILES+=boost.windows.patch +PATCH_FILES+=boost.vc2012.patch # Help static analysis tools (see SAL_UNUSED_PARAMETER in sal/types.h): .IF "$(COM)" == "GCC" -- cgit