Boost logo

Boost-Commit :

Subject: [Boost-commit] svn:boost r75395 - in trunk/boost/spirit/home: karma/operator support
From: joel_at_[hidden]
Date: 2011-11-07 17:57:32


Author: djowel
Date: 2011-11-07 17:57:31 EST (Mon, 07 Nov 2011)
New Revision: 75395
URL: http://svn.boost.org/trac/boost/changeset/75395

Log:
C++11 patches by Michel Morin
Text files modified:
   trunk/boost/spirit/home/karma/operator/alternative.hpp | 5 ++++-
   trunk/boost/spirit/home/karma/operator/sequence.hpp | 5 ++++-
   trunk/boost/spirit/home/support/attributes.hpp | 5 ++++-
   3 files changed, 12 insertions(+), 3 deletions(-)

Modified: trunk/boost/spirit/home/karma/operator/alternative.hpp
==============================================================================
--- trunk/boost/spirit/home/karma/operator/alternative.hpp (original)
+++ trunk/boost/spirit/home/karma/operator/alternative.hpp 2011-11-07 17:57:31 EST (Mon, 07 Nov 2011)
@@ -26,6 +26,7 @@
 #include <boost/fusion/include/for_each.hpp>
 #include <boost/mpl/accumulate.hpp>
 #include <boost/mpl/bitor.hpp>
+#include <boost/config.hpp>
 
 namespace boost { namespace spirit
 {
@@ -61,9 +62,11 @@
             };
 
             // never called, but needed for decltype-based result_of (C++0x)
+#ifndef BOOST_NO_RVALUE_REFERENCES
             template <typename Element>
             typename result<element_properties(Element)>::type
- operator()(Element&) const;
+ operator()(Element&&) const;
+#endif
         };
 
         typedef typename mpl::accumulate<

Modified: trunk/boost/spirit/home/karma/operator/sequence.hpp
==============================================================================
--- trunk/boost/spirit/home/karma/operator/sequence.hpp (original)
+++ trunk/boost/spirit/home/karma/operator/sequence.hpp 2011-11-07 17:57:31 EST (Mon, 07 Nov 2011)
@@ -37,6 +37,7 @@
 #include <boost/mpl/not.hpp>
 #include <boost/fusion/include/transform.hpp>
 #include <boost/mpl/accumulate.hpp>
+#include <boost/config.hpp>
 
 ///////////////////////////////////////////////////////////////////////////////
 namespace boost { namespace spirit
@@ -72,9 +73,11 @@
             };
 
             // never called, but needed for decltype-based result_of (C++0x)
+#ifndef BOOST_NO_RVALUE_REFERENCES
             template <typename Element>
             typename result<element_properties(Element)>::type
- operator()(Element&) const;
+ operator()(Element&&) const;
+#endif
         };
 
         typedef typename mpl::accumulate<

Modified: trunk/boost/spirit/home/support/attributes.hpp
==============================================================================
--- trunk/boost/spirit/home/support/attributes.hpp (original)
+++ trunk/boost/spirit/home/support/attributes.hpp 2011-11-07 17:57:31 EST (Mon, 07 Nov 2011)
@@ -45,6 +45,7 @@
 #include <boost/utility/enable_if.hpp>
 #include <boost/variant.hpp>
 #include <boost/range/iterator_range.hpp>
+#include <boost/config.hpp>
 #include <vector>
 #include <utility>
 #include <ios>
@@ -747,9 +748,11 @@
             };
 
             // never called, but needed for decltype-based result_of (C++0x)
+#ifndef BOOST_NO_RVALUE_REFERENCES
             template <typename Element>
             typename result<element_attribute(Element)>::type
- operator()(Element&) const;
+ operator()(Element&&) const;
+#endif
         };
 
         // Compute the list of attributes of all sub-components


Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk