[Libreoffice-commits] core.git: boost/boost.ptree.patch boost/UnpackedTarball_boost.mk

[Fridrich Å trba]

 boost/UnpackedTarball_boost.mk |    2 ++
 boost/boost.ptree.patch        |   11 +++++++++++
 2 files changed, 13 insertions(+)

New commits:
commit 41d2b58b1ed5c1c4a1ca6ab3e6d7c4f15874d3a3
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Mon Apr 22 18:34:04 2013 +0200

    Trying to fix a boost::property_tree::json_parser error on windows
    
    Change-Id: Iea3ec9a56eb008c6a0729a151b392f1e62925720

diff --git a/boost/UnpackedTarball_boost.mk b/boost/UnpackedTarball_boost.mk
index 6474f22..687a163 100644
--- a/boost/UnpackedTarball_boost.mk
+++ b/boost/UnpackedTarball_boost.mk
@@ -62,6 +62,8 @@ boost_patches += boost_1_44_0-gcc4.8.patch
 # https://svn.boost.org/trac/boost/changeset/78496
 boost_patches += boost.4874.patch
 
+boost_patches += boost.ptree.patch
+
 $(eval $(call gb_UnpackedTarball_UnpackedTarball,boost))
 
 $(eval $(call gb_UnpackedTarball_set_tarball,boost,$(BOOST_TARBALL)))
diff --git a/boost/boost.ptree.patch b/boost/boost.ptree.patch
new file mode 100644
index 0000000..3fa98d8
--- /dev/null
+++ b/boost/boost.ptree.patch
@@ -0,0 +1,11 @@
+--- misc/build/boost_1_44_0/boost/property_tree/detail/json_parser_read.hpp	2013-04-22 18:22:16.961642320 +0200
++++ misc/build/boost_1_44_0/boost/property_tree/detail/json_parser_read.hpp	2013-04-22 18:22:59.991632602 +0200
+@@ -102,7 +102,7 @@
+             void operator()(It b, It e) const
+             {
+                 BOOST_ASSERT(c.stack.size() >= 1);
+-                c.stack.back()->push_back(std::make_pair(c.name, Str(b, e)));
++                c.stack.back()->push_back(std::make_pair(c.name, Ptree(Str(b, e))));
+                 c.name.clear();
+                 c.string.clear();
+             }