summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2011-04-05 15:07:02 +0100
committerCaolán McNamara <caolanm@redhat.com>2011-04-05 15:07:02 +0100
commit2fdce0355265dd0bc8fbad897526ef6793e12b5c (patch)
tree4135767bb81ea23a41fcef3375a21b6de0477e35
parent1250d4ea73e97fd1292594cd194676d782dd984e (diff)
silence some more of that annoying gcc#47679
-rw-r--r--boost/boost.gcc47679.patch23
1 files changed, 23 insertions, 0 deletions
diff --git a/boost/boost.gcc47679.patch b/boost/boost.gcc47679.patch
index 1c804aaa998c..9b33a5fffb8a 100644
--- a/boost/boost.gcc47679.patch
+++ b/boost/boost.gcc47679.patch
@@ -36,3 +36,26 @@
template <int MaxDigits>
inline bool allow_more_digits(std::size_t i)
{
+--- misc/boost_1_44_0/boost/optional/optional.hpp 2011-04-05 13:19:01.223587256 +0100
++++ 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 <string.h>
++
+ #if BOOST_WORKAROUND(BOOST_MSVC, == 1200)
+ // VC6.0 has the following bug:
+ // When a templated assignment operator exist, an implicit conversion
+@@ -114,6 +116,11 @@
+
+ public:
+
++ aligned_storage()
++ {
++ memset(&dummy_, 0, sizeof(dummy_));
++ }
++
+ void const* address() const { return &dummy_.data[0]; }
+ void * address() { return &dummy_.data[0]; }
+ } ;