mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix sal build with vs2012

Browse Source 
Change-Id: Ia03980d5d890de7db1e606409a646a5a4f79e91e
This commit is contained in:
Peter Foley
2012-08-16 15:38:00 -04:00
parent 37b9e290d9
commit 5d25bbee44
2 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
boost/boost.vc2012.patch Normal file
View File

@@ -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

1
boost/makefile.mk
View File

@@ -69,6 +69,7 @@ PATCH_FILES+=boost.6397.warnings.patch
PATCH_FILES+=boost.mipsbackport.patch PATCH_FILES+=boost.mipsbackport.patch
PATCH_FILES+=boost.windows.patch PATCH_FILES+=boost.windows.patch
PATCH_FILES+=boost.vc2012.patch
# Help static analysis tools (see SAL_UNUSED_PARAMETER in sal/types.h): # Help static analysis tools (see SAL_UNUSED_PARAMETER in sal/types.h):
.IF "$(COM)" == "GCC" .IF "$(COM)" == "GCC"