boost/UnpackedTarball_boost.mk | 1 + boost/boost.transform_width.patch | 11 +++++++++++ vcl/source/window/builder.cxx | 2 +- 3 files changed, 13 insertions(+), 1 deletion(-)
New commits: commit 6116f93586ebfc6256f6f953e347e0d273ae2d7c Author: Tor Lillqvist <[email protected]> Date: Wed Jul 3 19:46:16 2013 +0300 WaE: unused variable 'sAdjustment' [loplugin] Change-Id: I1417254b748a7516024dd098928b3f22dca1e584 diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx index 5d02b3b..c5fd105 100644 --- a/vcl/source/window/builder.cxx +++ b/vcl/source/window/builder.cxx @@ -1162,7 +1162,7 @@ Window *VclBuilder::makeObject(Window *pParent, const OString &name, const OStri if (!sPattern.isEmpty()) { - OString sAdjustment = extractAdjustment(rMap); + extractAdjustment(rMap); OString sUnit = extractUnit(sPattern); FieldUnit eUnit = detectMetricUnit(sUnit); SAL_WARN("vcl.layout", "making metric box for " << name.getStr() << " " << sUnit.getStr() commit 2ffd377f725e79c7411dfbe1a3a7a847d749efc6 Author: Tor Lillqvist <[email protected]> Date: Wed Jul 3 19:43:34 2013 +0300 std::min comes from <algorithm> Fixes configuration error in libvisio. Change-Id: I6a6f743eca5fdfc990aadd69406b21d3ccdc6435 diff --git a/boost/UnpackedTarball_boost.mk b/boost/UnpackedTarball_boost.mk index fefe8fa..36b8285 100644 --- a/boost/UnpackedTarball_boost.mk +++ b/boost/UnpackedTarball_boost.mk @@ -40,6 +40,7 @@ boost_patches += boost.auto_link.patch boost_patches += boost.endian.patch boost_patches += boost.loplugin.patch boost_patches += boost.std.move.patch +boost_patches += boost.transform_width.patch boost_patches += boost.wundef.patch boost_patches += boost.wunused.patch boost_patches += boost.wshadow.patch diff --git a/boost/boost.transform_width.patch b/boost/boost.transform_width.patch new file mode 100644 index 0000000..747a17d --- /dev/null +++ b/boost/boost.transform_width.patch @@ -0,0 +1,11 @@ +--- foo/foo/foo/boost/archive/iterators/transform_width.hpp ++++ foo/foo/foo/boost/archive/iterators/transform_width.hpp +@@ -23,6 +23,8 @@ + // stream length is some common multiple of x and y. E.G. Base64 6 bit + // character and 8 bit bytes. Lowest common multiple is 24 => 4 6 bit characters + // or 3 8 bit characters ++ ++#include <algorithm> + + #include <boost/config.hpp> // for BOOST_DEDUCED_TYPENAME & PTFO + #include <boost/serialization/pfto.hpp> _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
