Swiftdiff options
| author | Tobias Markmann <tm@ayena.de> | 2015-11-12 13:42:58 (GMT) |
|---|---|---|
| committer | Kevin Smith <kevin.smith@isode.com> | 2015-12-17 20:06:10 (GMT) |
| commit | 02a5b5c7f263913bd3d9b6977a1c6935e90c97eb (patch) | |
| tree | c5f3078540ae663d2a7cd379660f2fb8847efb06 /3rdParty/Boost | |
| parent | 6c63910aa1016f06113fd562c8ffebfa6b4241b2 (diff) | |
| download | swift-02a5b5c7f263913bd3d9b6977a1c6935e90c97eb.zip swift-02a5b5c7f263913bd3d9b6977a1c6935e90c97eb.tar.bz2 | |
3rdParty fixes to enable compatibility with VS 2015
Included patches for future reference.
Test-Information:
Tested patches with VS 2015 Community and unit tests for
32 bit and 64 bit builds.
Change-Id: Ifa8d0ca3bf33010af8d8094c6df45f2a5702976c
Diffstat (limited to '3rdParty/Boost')
| -rw-r--r-- | 3rdParty/Boost/03_boost_silence_VS2015_compat_warning.diff | 13 | ||||
| -rw-r--r-- | 3rdParty/Boost/src/boost/config/compiler/visualc.hpp | 2 |
2 files changed, 14 insertions, 1 deletions
diff --git a/3rdParty/Boost/03_boost_silence_VS2015_compat_warning.diff b/3rdParty/Boost/03_boost_silence_VS2015_compat_warning.diff new file mode 100644 index 0000000..7cbfbdd --- /dev/null +++ b/3rdParty/Boost/03_boost_silence_VS2015_compat_warning.diff @@ -0,0 +1,13 @@ +diff --git a/3rdParty/Boost/src/boost/config/compiler/visualc.hpp b/3rdParty/Boost/src/boost/config/compiler/visualc.hpp +index 842f086..3c0fbce 100644 +--- a/3rdParty/Boost/src/boost/config/compiler/visualc.hpp ++++ b/3rdParty/Boost/src/boost/config/compiler/visualc.hpp +@@ -253,7 +253,7 @@ + + // + // last known and checked version is 18.00.20827.3 (VC12 RC, aka 2013 RC): +-#if (_MSC_VER > 1800 && _MSC_FULL_VER > 180020827) ++#if (_MSC_VER > 1900) + # if defined(BOOST_ASSERT_CONFIG) + # error "Unknown compiler version - please run the configure tests and report the results" + # else diff --git a/3rdParty/Boost/src/boost/config/compiler/visualc.hpp b/3rdParty/Boost/src/boost/config/compiler/visualc.hpp index 842f086..3c0fbce 100644 --- a/3rdParty/Boost/src/boost/config/compiler/visualc.hpp +++ b/3rdParty/Boost/src/boost/config/compiler/visualc.hpp @@ -253,7 +253,7 @@ // // last known and checked version is 18.00.20827.3 (VC12 RC, aka 2013 RC): -#if (_MSC_VER > 1800 && _MSC_FULL_VER > 180020827) +#if (_MSC_VER > 1900) # if defined(BOOST_ASSERT_CONFIG) # error "Unknown compiler version - please run the configure tests and report the results" # else |