boost/boost.wunused.patch | 11 ++++++++++- include/sal/log.hxx | 8 ++++++-- solenv/Executable_concat-deps.mk | 3 +++ 3 files changed, 19 insertions(+), 3 deletions(-)
New commits: commit da1dea9ae24fd4b17c54646f158c617a098291aa Author: Tor Lillqvist <[email protected]> Date: Mon May 27 23:09:59 2013 +0300 WaE: unused parameter 't' Change-Id: I5bfb2e2c44e11a03278a4a127396dcb2861c63b8 diff --git a/boost/boost.wunused.patch b/boost/boost.wunused.patch index 89abb53..f305b4f 100644 --- a/boost/boost.wunused.patch +++ b/boost/boost.wunused.patch @@ -1,3 +1,13 @@ +--- foo/foo/foo/boost/math/special_functions/fpclassify.hpp ++++ foo/foo/foo/boost/math/special_functions/fpclassify.hpp +@@ -100,6 +100,7 @@ + #ifdef isnan + return isnan(t); + #elif defined(BOOST_MATH_DISABLE_STD_FPCLASSIFY) || !defined(BOOST_HAS_FPCLASSIFY) ++ (void) t; + return false; + #else // BOOST_HAS_FPCLASSIFY + return (BOOST_FPCLASSIFY_PREFIX fpclassify(t) == (int)FP_NAN); --- foo/foo/foo/boost/unordered/detail/table.hpp +++ foo/foo/foo/boost/unordered/detail/table.hpp @@ -458,6 +458,7 @@ @@ -8,4 +18,3 @@ BOOST_ASSERT(node_alloc() == other.node_alloc()); } - commit b2a50c70072d55d0055d41e6862138a6a06cb08d Author: Tor Lillqvist <[email protected]> Date: Tue May 28 09:12:27 2013 +0300 Nah, we still need the dynamic_cast in SAL_STREAM for gcc/libstdc++ Not sure if MSVC would accept also the simpler thing, but anyway, the dynamic_cast works for it, too. Change-Id: I2dfa1e70b75bc17d38b5e95be0a0f1dd66767bf1 diff --git a/include/sal/log.hxx b/include/sal/log.hxx index ca3bb5e..23ea6f3 100644 --- a/include/sal/log.hxx +++ b/include/sal/log.hxx @@ -157,8 +157,13 @@ inline char const * unwrapStream(SAL_UNUSED_PARAMETER StreamIgnore const &) { @since LibreOffice 3.5 */ +#ifdef _LIBCPP_VERSION #define SAL_STREAM(stream) \ (::std::ostringstream() << stream).str() +#else +#define SAL_STREAM(stream) \ + (dynamic_cast< ::std::ostringstream & >(::std::ostringstream() << stream).str()) +#endif /** @page sal_log Basic logging functionality. commit 00f13ed9dd944846740e6a9867cf02a48585a609 Author: Tor Lillqvist <[email protected]> Date: Mon May 27 20:36:36 2013 +0300 Fix build of concat-deps on OS X when solver/*/lib does not yet exist Otherwise the -Wl,-fatal_warnings will hit us. Change-Id: Ib41a1aa291ebc4605c9e314505338e1b8adb886a diff --git a/solenv/Executable_concat-deps.mk b/solenv/Executable_concat-deps.mk index a69b757..5d6a38e 100644 --- a/solenv/Executable_concat-deps.mk +++ b/solenv/Executable_concat-deps.mk @@ -9,6 +9,9 @@ $(eval $(call gb_Executable_Executable,concat-deps)) +$(eval $(call gb_Executable_set_ldflags,concat-deps,\ + $(filter-out $(SOLARLIB),$$(LDFLAGS)))) + $(eval $(call gb_Executable_add_cobjects,concat-deps,\ solenv/bin/concat-deps, $(gb_COMPILEROPTFLAGS) \ )) commit 691b6ea8e100fc55f0ff70a82511722733113a07 Author: Tor Lillqvist <[email protected]> Date: Tue May 28 08:43:57 2013 +0300 Make the SAL_STREAM thing compile with clang++ -std=c++11 -stdlib=libc++ Avoid error: dynamic_cast from rvalue to reference type '::std::ostringstream &'. Change-Id: If5ba1ee79616e81b12f9db67c61b4f085b30a08e diff --git a/include/sal/log.hxx b/include/sal/log.hxx index 80721d0..ca3bb5e 100644 --- a/include/sal/log.hxx +++ b/include/sal/log.hxx @@ -158,8 +158,7 @@ inline char const * unwrapStream(SAL_UNUSED_PARAMETER StreamIgnore const &) { @since LibreOffice 3.5 */ #define SAL_STREAM(stream) \ - (dynamic_cast< ::std::ostringstream & >(::std::ostringstream() << stream). \ - str()) + (::std::ostringstream() << stream).str() /** @page sal_log Basic logging functionality. _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
