diff options
| author | Tor Lillqvist <tml@iki.fi> | 2013-05-27 15:29:30 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2013-05-27 16:39:41 +0300 |
| commit | f60af9ca6b6a66693d08ec08253f8d38a47d0050 (patch) | |
| tree | 81d8bc10ec1d534812bbc7e542def1bc4c1570bb /boost | |
| parent | writerfilter: update README (diff) | |
| download | core-f60af9ca6b6a66693d08ec08253f8d38a47d0050.tar.gz core-f60af9ca6b6a66693d08ec08253f8d38a47d0050.zip | |
Use a maximum fuzz factor of 1 for our patches to 3rd-party code
Change-Id: Id4639f1b0eefe5d433c84f48b7a1093fa17a3ba4
Diffstat (limited to 'boost')
| -rw-r--r-- | boost/boost.3780.aliasing.patch | 2 | ||||
| -rw-r--r-- | boost/boost.4510.warnings.patch | 2 | ||||
| -rw-r--r-- | boost/boost.gcc47679.patch | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/boost/boost.3780.aliasing.patch b/boost/boost.3780.aliasing.patch index f279e33a9412..d9cff1b7aa99 100644 --- a/boost/boost.3780.aliasing.patch +++ b/boost/boost.3780.aliasing.patch @@ -1,6 +1,6 @@ --- misc/boost_1_44_0/boost/function/function_base.hpp +++ misc/build/boost_1_44_0/boost/function/function_base.hpp -@@ -314,15 +322,15 @@ +@@ -314,17 +322,17 @@ { if (op == clone_functor_tag || op == move_functor_tag) { const functor_type* in_functor = diff --git a/boost/boost.4510.warnings.patch b/boost/boost.4510.warnings.patch index 826c57052068..11fdaceef1e2 100644 --- a/boost/boost.4510.warnings.patch +++ b/boost/boost.4510.warnings.patch @@ -1,8 +1,8 @@ --- 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 @@ - } // namespace detail + } // namespace detail +// MSVC 2008 produces 2 warnings "default constructor could not be generated" +// here that run over ~100 lines :( diff --git a/boost/boost.gcc47679.patch b/boost/boost.gcc47679.patch index 72ab15a97b09..e62a874c1bfc 100644 --- a/boost/boost.gcc47679.patch +++ b/boost/boost.gcc47679.patch @@ -40,7 +40,7 @@ +++ misc/build/boost_1_44_0/boost/optional/optional.hpp 2011-04-05 13:19:01.223587256 +0100 @@ -31,6 +31,8 @@ - #include "boost/optional/optional_fwd.hpp" + #include <boost/optional/optional_fwd.hpp> +#include <string.h> + |