diff options
| author | Isamu Mogi <saturday6c@gmail.com> | 2013-05-17 21:20:29 +0900 |
|---|---|---|
| committer | Fridrich Strba <fridrich@documentfoundation.org> | 2013-05-17 15:32:46 +0000 |
| commit | d68243cd663e55418831a157615ea588848804bb (patch) | |
| tree | c5d6aca0e2db02bacf7f573883f608826dbd630b /boost | |
| parent | 8fc9351f555cecdbb45dbf2752fea0efcaa6e0cd (diff) | |
Fix warnings by shadowing variables in boost/logic/tribool.hpp
Change-Id: I7d85cdb5e32802ddfd83a350f3daa49348bc18a6
Reviewed-on: https://gerrit.libreoffice.org/3935
Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org>
Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
Diffstat (limited to 'boost')
| -rw-r--r-- | boost/UnpackedTarball_boost.mk | 2 | ||||
| -rwxr-xr-x | boost/boost.3093.warnings.patch | 11 |
2 files changed, 13 insertions, 0 deletions
diff --git a/boost/UnpackedTarball_boost.mk b/boost/UnpackedTarball_boost.mk index 658fcb0fe51a..ba497d0566b5 100644 --- a/boost/UnpackedTarball_boost.mk +++ b/boost/UnpackedTarball_boost.mk @@ -8,6 +8,8 @@ # boost_patches := +#https://svn.boost.org/trac/boost/ticket/3093 +boost_patches += boost.3093.warnings.patch #https://svn.boost.org/trac/boost/ticket/3780 boost_patches += boost.3780.aliasing.patch #https://svn.boost.org/trac/boost/ticket/4127 diff --git a/boost/boost.3093.warnings.patch b/boost/boost.3093.warnings.patch new file mode 100755 index 000000000000..1b2bf6da423d --- /dev/null +++ b/boost/boost.3093.warnings.patch @@ -0,0 +1,11 @@ +--- misc/boost_1_44_0/boost/logic/tribool.hpp Sun Nov 25 18:07:19 2007 ++++ misc/build/boost_1_44_0/boost/logic/tribool.hpp Fri May 17 12:03:35 2013 +@@ -93,7 +93,7 @@ + * + * \throws nothrow + */ +- tribool(bool value) : value(value? true_value : false_value) {} ++ tribool(bool initial_value) : value(initial_value? true_value : false_value) {} + + /** + * Construct a new 3-state boolean value with an indeterminate value. |