[Boost-commit] svn:boost r55481 - in sandbox/SOC/2009/fusion: . boost/fusion/algorithm/query/detail boost/fusion/algorithm/transformation boost/fusion/algorithm/transformation/detail

Subject: [Boost-commit] svn:boost r55481 - in sandbox/SOC/2009/fusion: . boost/fusion/algorithm/query/detail boost/fusion/algorithm/transformation boost/fusion/algorithm/transformation/detail
From: mr.chr.schmidt_at_[hidden]
Date: 2009-08-08 19:37:49

Author: cschmidt
Date: 2009-08-08 19:37:48 EDT (Sat, 08 Aug 2009)
New Revision: 55481
URL: http://svn.boost.org/trac/boost/changeset/55481

Log:
bugfixes
Text files modified: 
   sandbox/SOC/2009/fusion/boost/fusion/algorithm/query/detail/count.hpp               |     1 +                                       
   sandbox/SOC/2009/fusion/boost/fusion/algorithm/transformation/detail/replace_if.hpp |     2 +-                                      
   sandbox/SOC/2009/fusion/boost/fusion/algorithm/transformation/replace.hpp           |    17 -----------------                       
   sandbox/SOC/2009/fusion/boost/fusion/algorithm/transformation/replace_if.hpp        |     2 +-                                      
   sandbox/SOC/2009/fusion/build.bat                                                   |     6 +++---                                  
   5 files changed, 6 insertions(+), 22 deletions(-)

Modified: sandbox/SOC/2009/fusion/boost/fusion/algorithm/query/detail/count.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/algorithm/query/detail/count.hpp	(original)
+++ sandbox/SOC/2009/fusion/boost/fusion/algorithm/query/detail/count.hpp	2009-08-08 19:37:48 EDT (Sat, 08 Aug 2009)
@@ -8,6 +8,7 @@
 #ifndef BOOST_FUSION_ALGORITHM_QUERY_DETAIL_COUNT_HPP
 #define BOOST_FUSION_ALGORITHM_QUERY_DETAIL_COUNT_HPP
 
+#include <boost/mpl/or.hpp>
 #include <boost/type_traits/is_convertible.hpp>
 
 namespace boost { namespace fusion { namespace detail

Modified: sandbox/SOC/2009/fusion/boost/fusion/algorithm/transformation/detail/replace_if.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/algorithm/transformation/detail/replace_if.hpp	(original)
+++ sandbox/SOC/2009/fusion/boost/fusion/algorithm/transformation/detail/replace_if.hpp	2009-08-08 19:37:48 EDT (Sat, 08 Aug 2009)
@@ -16,7 +16,6 @@
 
 namespace boost { namespace fusion { namespace detail
 {
-    //TODO cschmidt: update doc. according to real behavior!
     template <typename F, typename NewValue>
     struct replace_if_helper
     {
@@ -75,6 +74,7 @@
         typename result<replace_if_helper(U&)>::type
         operator()(U& x) const
         {
+            //TODO cschmidt: update doc. according to real behavior!
             return call_impl(
                 x,
                 typename is_convertible<

Modified: sandbox/SOC/2009/fusion/boost/fusion/algorithm/transformation/replace.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/algorithm/transformation/replace.hpp	(original)
+++ sandbox/SOC/2009/fusion/boost/fusion/algorithm/transformation/replace.hpp	2009-08-08 19:37:48 EDT (Sat, 08 Aug 2009)
@@ -8,7 +8,6 @@
 #ifndef BOOST_FUSION_ALGORITHM_TRANSFORMATION_REPLACE_HPP
 #define BOOST_FUSION_ALGORITHM_TRANSFORMATION_REPLACE_HPP
 
-#include <boost/config.hpp>
 #include <boost/fusion/algorithm/transformation/replace_if.hpp>
 #include <boost/fusion/support/ref.hpp>
 #include <boost/fusion/support/detail/as_fusion_element.hpp>
@@ -27,22 +26,6 @@
               : old_value(BOOST_FUSION_FORWARD(OtherOldValue,old_value))
             {}
 
-#if BOOST_WORKAROUND(__GNUC__,<4)
-            //cschmidt: due to some strange reason the default assignment ctor/
-            //operator generated by gcc 3.x do not work in some cases. That is
-            //why we define them here.
-            replace_helper(replace_helper const& replacer)
-              : old_value(replacer.old_value)
-            {}
-
-            replace_helper&
-            operator=(replace_helper const& replacer)
-            {
-                old_value=replacer.old_value;
-                return *this;
-            }
-#endif
-
             template<typename Replacer>
             replace_helper(BOOST_FUSION_R_ELSE_CLREF(Replacer) replacer)
               : old_value(BOOST_FUSION_FORWARD(Replacer,replacer).old_value)

Modified: sandbox/SOC/2009/fusion/boost/fusion/algorithm/transformation/replace_if.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/algorithm/transformation/replace_if.hpp	(original)
+++ sandbox/SOC/2009/fusion/boost/fusion/algorithm/transformation/replace_if.hpp	2009-08-08 19:37:48 EDT (Sat, 08 Aug 2009)
@@ -22,7 +22,7 @@
         {
             typedef
                 detail::replace_if_helper<
-                    typename detail::add_lref<F>::type
+                    typename detail::as_fusion_element<F>::type
                   , typename detail::as_fusion_element<NewValue>::type
                 >
             replacer;

Modified: sandbox/SOC/2009/fusion/build.bat
==============================================================================
--- sandbox/SOC/2009/fusion/build.bat	(original)
+++ sandbox/SOC/2009/fusion/build.bat	2009-08-08 19:37:48 EDT (Sat, 08 Aug 2009)
@@ -16,7 +16,7 @@
         call :msvc
     ) else (
         if "%1" == "" (
-            call :gcc
+            call :msvc
         ) else (
             echo Unknown toolset '%1'
             goto :eof
@@ -29,8 +29,8 @@
 goto :eof
 
 :gcc
-set PATH=C:\MinGW3\bin;%PATH%
-rem set PATH=C:\MinGW\bin;%PATH%
+rem set PATH=C:\MinGW3\bin;%PATH%
+set PATH=C:\MinGW\bin;%PATH%
 set TOOLSET=gcc
 goto :eof