Dirk Mueller 2011-04-05 09:56:05 +00:00 committed by Git OBS Bridge
parent ffda47447f
commit 664529446e
3 changed files with 55 additions and 0 deletions

View File

@ -0,0 +1,47 @@
Index: boost/spirit/home/qi/auxiliary/attr.hpp
===================================================================
--- boost/spirit/home/qi/auxiliary/attr.hpp (revision 69217)
+++ boost/spirit/home/qi/auxiliary/attr.hpp (revision 69218)
@@ -18,6 +18,7 @@
#include <boost/spirit/home/qi/detail/assign_to.hpp>
#include <boost/spirit/home/qi/meta_compiler.hpp>
#include <boost/spirit/home/support/common_terminals.hpp>
+#include <boost/spirit/home/support/handles_container.hpp>
#include <boost/type_traits/add_reference.hpp>
#include <boost/type_traits/add_const.hpp>
#include <boost/type_traits/remove_const.hpp>
@@ -96,6 +97,14 @@
};
}}}
+namespace boost { namespace spirit { namespace traits
+{
+ ///////////////////////////////////////////////////////////////////////////
+ template <typename T, typename Attr, typename Context, typename Iterator>
+ struct handles_container<qi::attr_parser<T>, Attr, Context, Iterator>
+ : traits::is_container<Attr> {};
+}}}
+
#endif
Index: boost/spirit/home/qi/string/symbols.hpp
===================================================================
--- boost/spirit/home/qi/string/symbols.hpp (revision 70041)
+++ boost/spirit/home/qi/string/symbols.hpp (revision 70042)
@@ -398,6 +398,15 @@
};
}}}
+namespace boost { namespace spirit { namespace traits
+{
+ ///////////////////////////////////////////////////////////////////////////
+ template <typename Char, typename T, typename Lookup, typename Filter
+ , typename Attr, typename Context, typename Iterator>
+ struct handles_container<qi::symbols<Char, T, Lookup, Filter>, Attr, Context, Iterator>
+ : traits::is_container<Attr> {};
+}}}
+
#if defined(BOOST_MSVC)
# pragma warning(pop)
#endif

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Sun Mar 21 11:53:29 UTC 2011 - idoenmez@novell.com
- Fix attribute handling problem in spirit library,
See http://comments.gmane.org/gmane.comp.parsers.spirit.general/22073
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Mar 21 11:46:48 CET 2011 - pth@suse.de Mon Mar 21 11:46:48 CET 2011 - pth@suse.de

View File

@ -89,6 +89,7 @@ Patch1: boost-thread.patch
Patch2: boost-no_type_punning.patch Patch2: boost-no_type_punning.patch
Patch4: boost-visit_each.diff Patch4: boost-visit_each.diff
Patch8: boost-no_segfault_in_Regex_filter.patch Patch8: boost-no_segfault_in_Regex_filter.patch
Patch9: boost-fix-spirit-attr-handling.patch
Patch19: boost-sane_versioning.patch Patch19: boost-sane_versioning.patch
Patch20: boost-strict_aliasing.patch Patch20: boost-strict_aliasing.patch
Patch50: boost-use_std_xml_catalog.patch Patch50: boost-use_std_xml_catalog.patch
@ -429,6 +430,7 @@ find -type f ! \( -name \*.sh -o -name \*.py -o -name \*.pl \) -exec chmod -x {}
%patch2 %patch2
%patch4 %patch4
%patch8 %patch8
%patch9
%patch19 %patch19
%patch20 %patch20
%patch50 %patch50