[Boost-commit] svn:boost r67164 - in sandbox/configurator/boost/configurator: . detail

Subject: [Boost-commit] svn:boost r67164 - in sandbox/configurator/boost/configurator: . detail
From: for.dshevchenko_at_[hidden]
Date: 2010-12-11 06:21:49

Author: dshevchenko
Date: 2010-12-11 06:21:48 EST (Sat, 11 Dec 2010)
New Revision: 67164
URL: http://svn.boost.org/trac/boost/changeset/67164

Log:
1.0pre2 clean code (now it compiles in VC++2010)

Text files modified: 
   sandbox/configurator/boost/configurator/configurator.hpp                 |     3 +--                                     
   sandbox/configurator/boost/configurator/detail/pure_options_obtainer.hpp |    10 +++++-----                              
   2 files changed, 6 insertions(+), 7 deletions(-)

Modified: sandbox/configurator/boost/configurator/configurator.hpp
==============================================================================
--- sandbox/configurator/boost/configurator/configurator.hpp	(original)
+++ sandbox/configurator/boost/configurator/configurator.hpp	2010-12-11 06:21:48 EST (Sat, 11 Dec 2010)
@@ -175,14 +175,13 @@
         using boost::spirit::qi::char_;
         using boost::spirit::qi::parse;
         using boost::spirit::qi::_1;
-        using boost::phoenix::ref;
         using boost::phoenix::push_back;
         using boost::spirit::qi::rule;
 
         std::string pure_name = typeid( Option ).name();
         std::string name;
         
-        rule< detail::string_it > name_extractor = +( char_[ push_back( ref(name), _1 ) ] );
+        rule< detail::string_it > name_extractor = +( char_[ push_back( boost::phoenix::ref(name), _1 ) ] );
         rule< detail::string_it > unnecessary_prefix;
         #ifdef WIN_32
             unnecessary_prefix = *( char_ - ' ' ) >> ' ';

Modified: sandbox/configurator/boost/configurator/detail/pure_options_obtainer.hpp
==============================================================================
--- sandbox/configurator/boost/configurator/detail/pure_options_obtainer.hpp	(original)
+++ sandbox/configurator/boost/configurator/detail/pure_options_obtainer.hpp	2010-12-11 06:21:48 EST (Sat, 11 Dec 2010)
@@ -17,6 +17,7 @@
 #include <boost/assign.hpp>
 #include <boost/foreach.hpp>
 #include <boost/algorithm/string.hpp>
+#include <boost/spirit/include/qi.hpp>
 #include <boost/spirit/include/phoenix_core.hpp>
 #include <boost/spirit/include/phoenix_operator.hpp>
 #include <boost/spirit/include/phoenix_stl.hpp>
@@ -38,7 +39,6 @@
 using boost::spirit::qi::char_;
 using boost::spirit::qi::string;
 using boost::spirit::qi::parse;
-using boost::phoenix::ref;
 
 class pure_options_obtainer {
     typedef boost::function< bool ( std::string& /* analized string */
@@ -108,7 +108,7 @@
 
         simple_rule open_edge = !string( close_section_tag_begin_sign ) 
                                 >> string( open_section_tag_begin_sign );
-        simple_rule name_extractor = +( char_[ push_back( ref(name_of_opening_section), _1 ) ]
+        simple_rule name_extractor = +( char_[ push_back( boost::phoenix::ref(name_of_opening_section), _1 ) ]
                                         - string( open_section_tag_end_sign ) );
         simple_rule close_edge = string( open_section_tag_end_sign );
         simple_rule full = open_edge >> name_extractor >> close_edge;
@@ -158,7 +158,7 @@
         std::string name_of_closing_section;
 
         simple_rule open_edge = string( close_section_tag_begin_sign ); 
-        simple_rule name_extractor = +( char_[ push_back( ref(name_of_closing_section), _1 ) ] 
+        simple_rule name_extractor = +( char_[ push_back( boost::phoenix::ref(name_of_closing_section), _1 ) ] 
                                         - string( close_section_tag_end_sign ) );
         simple_rule close_edge = string( close_section_tag_end_sign );
         simple_rule full = open_edge >> name_extractor >> close_edge;
@@ -204,7 +204,7 @@
         std::string option_name;
         std::string option_value;
 
-        simple_rule name_extractor = +( char_[ push_back( ref(option_name), _1 ) ] 
+        simple_rule name_extractor = +( char_[ push_back( boost::phoenix::ref(option_name), _1 ) ] 
                                         - string( option_name_value_separator ) );
 
         simple_rule separator = string( option_name_value_separator );
@@ -212,7 +212,7 @@
             separator = +( string( option_name_value_separator ) );
         } else {}
 
-        simple_rule value_extractor = +( char_[ push_back( ref(option_value), _1 ) ] );
+        simple_rule value_extractor = +( char_[ push_back( boost::phoenix::ref(option_value), _1 ) ] );
         simple_rule full = name_extractor >> separator >> value_extractor;
 
         bool parsing_success = parse( s.begin(), s.end(), full );