diff options
author | Caolán McNamara <caolanm@redhat.com> | 2011-02-10 20:25:07 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2011-02-10 20:26:53 +0000 |
commit | bb716aa955f36eea607387ab3d62edbbcfbcd5c5 (patch) | |
tree | 60e932909a3be117b7ca2c8a00d16d27bd1bd63d /boost/boost.gcc47679.patch | |
parent | workaround gcc#47679 (diff) | |
download | core-bb716aa955f36eea607387ab3d62edbbcfbcd5c5.tar.gz core-bb716aa955f36eea607387ab3d62edbbcfbcd5c5.zip |
gcc#47679 needs more magic
Diffstat (limited to 'boost/boost.gcc47679.patch')
-rw-r--r-- | boost/boost.gcc47679.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/boost/boost.gcc47679.patch b/boost/boost.gcc47679.patch index 4af42b0dc854..961234673f40 100644 --- a/boost/boost.gcc47679.patch +++ b/boost/boost.gcc47679.patch @@ -1,14 +1,14 @@ ---- misc/boost_1_44_0/compare_pointees.hpp 2011-02-10 16:39:05.960176555 +0000 +--- misc/boost_1_44_0/boost/utility/compare_pointees.hpp 2011-02-10 16:39:05.960176555 +0000 +++ misc/build/boost_1_44_0/boost/utility/compare_pointees.hpp 2011-02-10 16:40:59.091423279 +0000 @@ -29,7 +29,11 @@ inline bool equal_pointees ( OptionalPointee const& x, OptionalPointee const& y ) { - return (!x) != (!y) ? false : ( !x ? true : (*x) == (*y) ) ; -+ if ((!x) != (!y)) -+ return false; -+ if (!x) ++ if (!x && !y) + return true; ++ if (!x || !y) ++ return false; + return (*x) == (*y); } |