Boost logo

Boost-Commit :

Subject: [Boost-commit] svn:boost r76046 - trunk/boost/spirit/home/karma/directive
From: hartmut.kaiser_at_[hidden]
Date: 2011-12-18 12:41:53


Author: hkaiser
Date: 2011-12-18 12:41:52 EST (Sun, 18 Dec 2011)
New Revision: 76046
URL: http://svn.boost.org/trac/boost/changeset/76046

Log:
Spirit: disambiguate cref.
Text files modified:
   trunk/boost/spirit/home/karma/directive/duplicate.hpp | 32 ++++++++++++++++----------------
   1 files changed, 16 insertions(+), 16 deletions(-)

Modified: trunk/boost/spirit/home/karma/directive/duplicate.hpp
==============================================================================
--- trunk/boost/spirit/home/karma/directive/duplicate.hpp (original)
+++ trunk/boost/spirit/home/karma/directive/duplicate.hpp 2011-12-18 12:41:52 EST (Sun, 18 Dec 2011)
@@ -51,29 +51,29 @@
         template <typename T
           , bool IsSequence = fusion::traits::is_sequence<T>::value>
         struct attribute_count
- : fusion::result_of::size<T>
+ : fusion::result_of::size<T>
         {};
 
         template <>
- struct attribute_count<unused_type, false>
- : mpl::int_<0>
+ struct attribute_count<unused_type, false>
+ : mpl::int_<0>
         {};
 
         template <typename T>
- struct attribute_count<T, false>
- : mpl::int_<1>
+ struct attribute_count<T, false>
+ : mpl::int_<1>
         {};
 
         ///////////////////////////////////////////////////////////////////////
         template <typename T
           , bool IsSequence = fusion::traits::is_sequence<T>::value>
- struct first_attribute_of_subject
- : fusion::result_of::at_c<T, 0>
+ struct first_attribute_of_subject
+ : fusion::result_of::at_c<T, 0>
         {};
 
         template <typename T>
- struct first_attribute_of_subject<T, false>
- : mpl::identity<T>
+ struct first_attribute_of_subject<T, false>
+ : mpl::identity<T>
         {};
 
         template <typename T, typename Context, typename Iterator>
@@ -93,20 +93,20 @@
 
             static type call(T const& t)
             {
- return fusion::make_cons(cref(t)
+ return fusion::make_cons(boost::cref(t)
                   , duplicate_sequence_attribute<Attribute, T, N-1>::call(t));
             }
         };
 
         template <typename Attribute, typename T>
- struct duplicate_sequence_attribute<Attribute, T, 1>
+ struct duplicate_sequence_attribute<Attribute, T, 1>
         {
             typedef typename fusion::result_of::make_cons<
                 reference_wrapper<T const> >::type type;
 
             static type call(T const& t)
             {
- return fusion::make_cons(cref(t));
+ return fusion::make_cons(boost::cref(t));
             }
         };
 
@@ -130,7 +130,7 @@
         };
 
         template <typename Attribute, typename T>
- struct duplicate_attribute<Attribute, T, 0, false>
+ struct duplicate_attribute<Attribute, T, 0, false>
         {
             typedef unused_type type;
 
@@ -155,12 +155,12 @@
     template <typename Attribute, typename T>
     inline typename detail::duplicate_attribute<Attribute, T>::type
     duplicate_attribute(T const& t)
- {
+ {
         return detail::duplicate_attribute<Attribute, T>::call(t);
     }
 
     ///////////////////////////////////////////////////////////////////////////
- // duplicate_directive duplicate its attribute for all elements of the
+ // duplicate_directive duplicate its attribute for all elements of the
     // subject generator without generating anything itself
     ///////////////////////////////////////////////////////////////////////////
     template <typename Subject>
@@ -182,7 +182,7 @@
         bool generate(OutputIterator& sink, Context& ctx, Delimiter const& d
           , Attribute const& attr) const
         {
- typedef typename traits::attribute_of<Subject, Context>::type
+ typedef typename traits::attribute_of<Subject, Context>::type
                 subject_attr_type;
             return subject.generate(sink, ctx, d
               , duplicate_attribute<subject_attr_type>(attr));


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