[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - boost/boost_1_55_0.patch

[Herbert Dürr]

 boost/boost_1_55_0.patch |   27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

New commits:
commit d393e8b05a78eb7479e3c5639cc8653039897a58
Author: Herbert Dürr <hdu at apache.org>
Date:   Thu Mar 13 16:40:46 2014 +0000

    #i124395# WaE: fix unused-local-typedef warning in boost/spirit

diff --git a/boost/boost_1_55_0.patch b/boost/boost_1_55_0.patch
index 16865c9..3f7f6f6 100644
--- a/boost/boost_1_55_0.patch
+++ b/boost/boost_1_55_0.patch
@@ -184,8 +184,8 @@
    return impl::call(c).head;
  }
  
---- misc/boost_1_55_0/boost/concept/detail/general.hpp	2010-06-08 21:31:13.000000000 +0200
-+++ misc/build/boost_1_55_0/boost/concept/detail/general.hpp	2014-03-13 17:20:13.450234546 +0100
+--- misc/boost_1_55_0/boost/concept/detail/general.hpp	2010-06-08 21:31:13 +0200
++++ misc/build/boost_1_55_0/boost/concept/detail/general.hpp	2014-03-13 17:20:13 +0100
 @@ -65,10 +65,10 @@
    
  # endif
@@ -201,3 +201,13 @@
  
  }}
  
+--- misc/boost_1_55_0/boost/spirit/home/classic/core/primitives/primitives.hpp	2014-03-12 14:02:51 +0100
++++ misc/build/boost_1_55_0/boost/spirit/home/classic/core/primitives/primitives.hpp	2008-06-22 17:05:38 +0200
+@@ -47,7 +47,6 @@
+         typename parser_result<self_t, ScannerT>::type
+         parse(ScannerT const& scan) const
+         {
+-            typedef typename parser_result<self_t, ScannerT>::type result_t;
+             typedef typename ScannerT::value_t value_t;
+             typedef typename ScannerT::iterator_t iterator_t;
+ 
commit ace25189a9b9572d8a35aca3e7162f8512b33425
Author: Herbert Dürr <hdu at apache.org>
Date:   Thu Mar 13 16:28:10 2014 +0000

    #i124395# WaE: fix unused-local-typedef warning from the BOOST_CONCEPT_ASSERT_FN macro

diff --git a/boost/boost_1_55_0.patch b/boost/boost_1_55_0.patch
index 706770d..16865c9 100644
--- a/boost/boost_1_55_0.patch
+++ b/boost/boost_1_55_0.patch
@@ -184,3 +184,20 @@
    return impl::call(c).head;
  }
  
+--- misc/boost_1_55_0/boost/concept/detail/general.hpp	2010-06-08 21:31:13.000000000 +0200
++++ misc/build/boost_1_55_0/boost/concept/detail/general.hpp	2014-03-13 17:20:13.450234546 +0100
+@@ -65,10 +65,10 @@
+   
+ # endif
+ 
+-#  define BOOST_CONCEPT_ASSERT_FN( ModelFnPtr )             \
+-    typedef ::boost::concepts::detail::instantiate<          \
+-    &::boost::concepts::requirement_<ModelFnPtr>::failed>    \
+-      BOOST_PP_CAT(boost_concept_check,__LINE__)
++#define BOOST_CONCEPT_ASSERT_FN( ModelFnPtr )             \
++    ::boost::concepts::detail::instantiate<               \
++    &::boost::concepts::requirement_<ModelFnPtr>::failed> \
++      BOOST_PP_CAT(boost_concept_check,__LINE__)()
+ 
+ }}
+