boost/UnpackedTarball_boost.mk | 1 + boost/boost.4100.warnings.patch | 19 +++++++++++++++++++ svl/source/passwordcontainer/passwordcontainer.cxx | 2 +- 3 files changed, 21 insertions(+), 1 deletion(-)
New commits: commit 0b9ebd78778baf241cd08457e1abbe07c73c5f80 Author: Michael Stahl <[email protected]> Date: Wed Oct 24 16:04:33 2012 +0200 boost: disable spurious MSVC warning C4100 in msvc.hpp It warns that "x" is unreferenced formal parameter in virtual void failed(Model *x) { x->~Model(); } Change-Id: I10a4e1f037726f0225c2c6bf4ee23d5fb2accf7d diff --git a/boost/UnpackedTarball_boost.mk b/boost/UnpackedTarball_boost.mk index b7ebd67..7dab6c0 100644 --- a/boost/UnpackedTarball_boost.mk +++ b/boost/UnpackedTarball_boost.mk @@ -26,6 +26,7 @@ boost_patches += boost.6397.warnings.patch boost_patches += boost.mipsbackport.patch #https://svn.boost.org/trac/boost/ticket/7551 boost_patches += boost.7551.unusedvars.patch +boost_patches += boost.4100.warnings.patch boost_patches += boost.windows.patch boost_patches += boost.vc2012.patch diff --git a/boost/boost.4100.warnings.patch b/boost/boost.4100.warnings.patch new file mode 100644 index 0000000..ea47577 --- /dev/null +++ b/boost/boost.4100.warnings.patch @@ -0,0 +1,19 @@ +--- misc/boost_1_44_0/boost/concept/detail/msvc.hpp ++++ misc/build/boost_1_44_0/boost/concept/detail/msvc.hpp +@@ -12,6 +12,9 @@ + # include <boost/mpl/if.hpp> + # endif + ++// disable spurious "unreferenced formal parameter" warnings ++#pragma warning( push ) ++#pragma warning( disable: 4100 ) + + namespace boost { namespace concepts { + +@@ -111,4 +114,6 @@ + # endif + }} + ++#pragma warning( pop ) ++ + #endif // BOOST_CONCEPT_CHECK_MSVC_DWA2006429_HPP commit 9a8662c5ccb7c2f650ff27af62eb569fc37c448f Author: Michael Stahl <[email protected]> Date: Wed Oct 24 15:24:08 2012 +0200 PasswordContainer::allowPersistentStoring: fix warning C4805 Change-Id: I8e2208bd054272ef6b461eadf1244e84968e8737 diff --git a/svl/source/passwordcontainer/passwordcontainer.cxx b/svl/source/passwordcontainer/passwordcontainer.cxx index 7280a04..ed94353 100644 --- a/svl/source/passwordcontainer/passwordcontainer.cxx +++ b/svl/source/passwordcontainer/passwordcontainer.cxx @@ -1256,7 +1256,7 @@ void SAL_CALL PasswordContainer::removeMasterPassword() if ( !bAllow ) removeMasterPassword(); - if ( m_pStorageFile->useStorage() == bAllow ) + if (m_pStorageFile->useStorage() == static_cast<bool>(bAllow)) return bAllow; m_pStorageFile->setUseStorage( bAllow ); _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
