diff options
| author | Michael Stahl <mstahl@redhat.com> | 2012-10-25 17:32:19 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2012-10-25 17:37:35 +0200 |
| commit | 5adb2fb940c79f44ee03a14842cf96dc054cd904 (patch) | |
| tree | a6b05b775b221eab011d63294be3576bc345b9c4 /boost | |
| parent | 6fb13dd1aaf27ba7494cf65a11404339ef0e7754 (diff) | |
boost: disable MSVC warnings C4510, C4610 for ...
boost::detail::multi_array::ConstMultiArrayConcept
Change-Id: I8937079337eb3c4cfd29c03c6602b99b28f5c59e
Diffstat (limited to 'boost')
| -rw-r--r-- | boost/UnpackedTarball_boost.mk | 1 | ||||
| -rw-r--r-- | boost/boost.4510.warnings.patch | 26 |
2 files changed, 27 insertions, 0 deletions
diff --git a/boost/UnpackedTarball_boost.mk b/boost/UnpackedTarball_boost.mk index 7dab6c0a85d2..d482077a84cc 100644 --- a/boost/UnpackedTarball_boost.mk +++ b/boost/UnpackedTarball_boost.mk @@ -27,6 +27,7 @@ boost_patches += boost.mipsbackport.patch #https://svn.boost.org/trac/boost/ticket/7551 boost_patches += boost.7551.unusedvars.patch boost_patches += boost.4100.warnings.patch +boost_patches += boost.4510.warnings.patch boost_patches += boost.windows.patch boost_patches += boost.vc2012.patch diff --git a/boost/boost.4510.warnings.patch b/boost/boost.4510.warnings.patch new file mode 100644 index 000000000000..a13d3651af20 --- /dev/null +++ b/boost/boost.4510.warnings.patch @@ -0,0 +1,26 @@ +--- misc/boost_1_44_0/boost/multi_array/concept_checks.hpp ++++ misc/build/boost_1_44_0/boost/multi_array/concept_checks.hpp +@@ -56,6 +56,13 @@ + } + }; + ++// MSVC 2008 produces 2 warnings "default constructor could not be generated" ++// here that run over ~100 lines :( ++#ifdef _MSC_VER ++#pragma warning(push,1) ++#pragma warning(disable: 4510) ++#pragma warning(disable: 4610) ++#endif + + template <typename Array, std::size_t NumDims > + struct ConstMultiArrayConcept +@@ -117,6 +124,9 @@ + index_range range; + }; + ++#ifdef _MSC_VER ++#pragma warning(pop) ++#endif + + template <typename Array, std::size_t NumDims > + struct MutableMultiArrayConcept |