diff options
| author | Tor Lillqvist <tml@iki.fi> | 2012-04-03 23:08:46 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2012-04-04 01:05:45 +0300 |
| commit | b91061f8e90a5da5db424f010d00cdf5cc60922b (patch) | |
| tree | 3ad696c8d0ae212bf881234ec18a43ad196344b8 /boost | |
| parent | 3afbf314b76ab2677accf330915088c07bd7c471 (diff) | |
WaE: '&&' within '||'
Diffstat (limited to 'boost')
| -rw-r--r-- | boost/boost_1_44_0-logical-op-parentheses.patch | 12 | ||||
| -rw-r--r-- | boost/makefile.mk | 1 |
2 files changed, 13 insertions, 0 deletions
diff --git a/boost/boost_1_44_0-logical-op-parentheses.patch b/boost/boost_1_44_0-logical-op-parentheses.patch new file mode 100644 index 000000000000..33a8ea083809 --- /dev/null +++ b/boost/boost_1_44_0-logical-op-parentheses.patch @@ -0,0 +1,12 @@ +--- misc/boost_1_44_0/boost/spirit/home/classic/core/composite/directives.hpp ++++ misc/build/boost_1_44_0/boost/spirit/home/classic/core/composite/directives.hpp +@@ -364,7 +364,7 @@ + + if (l || r) + { +- if (l.length() < r.length() && l || !r) ++ if ((l.length() < r.length() && l) || !r) + { + scan.first = save; + return l; + diff --git a/boost/makefile.mk b/boost/makefile.mk index cab945fc5a17..27e588de2eae 100644 --- a/boost/makefile.mk +++ b/boost/makefile.mk @@ -69,6 +69,7 @@ PATCH_FILES+=boost.windows.patch # Help static analysis tools (see SAL_UNUSED_PARAMETER in sal/types.h): .IF "$(COM)" == "GCC" PATCH_FILES += boost_1_44_0-unused-parameters.patch +PATCH_FILES += boost_1_44_0-logical-op-parentheses.patch .END # Backporting fixes for the GCC 4.7 -std=c++11 mode from Boost 1.48.0: |