[Boost-commit] svn:boost r40910 - in sandbox/SOC/2007/signals/boost/dataflow/signals/component: . detail

From: stipe_at_[hidden]
Date: 2007-11-07 16:22:49

Author: srajko
Date: 2007-11-07 16:22:49 EST (Wed, 07 Nov 2007)
New Revision: 40910
URL: http://svn.boost.org/trac/boost/changeset/40910

Log:
make ::template operator()<N> only for msvc, gcc 4 needs it
Text files modified: 
   sandbox/SOC/2007/signals/boost/dataflow/signals/component/detail/unfused_inherited_templated.hpp |     7 ++++++-                                 
   sandbox/SOC/2007/signals/boost/dataflow/signals/component/multiplexer.hpp                        |    14 ++++++++++++--                          
   2 files changed, 18 insertions(+), 3 deletions(-)

Modified: sandbox/SOC/2007/signals/boost/dataflow/signals/component/detail/unfused_inherited_templated.hpp
==============================================================================
--- sandbox/SOC/2007/signals/boost/dataflow/signals/component/detail/unfused_inherited_templated.hpp	(original)
+++ sandbox/SOC/2007/signals/boost/dataflow/signals/component/detail/unfused_inherited_templated.hpp	2007-11-07 16:22:49 EST (Wed, 07 Nov 2007)
@@ -32,6 +32,7 @@
 
 #include <boost/fusion/functional/adapter/limits.hpp>
 
+#include <boost/config.hpp>
 #include <boost/mpl/size.hpp>
 #include <boost/utility/result_of.hpp>
 
@@ -127,7 +128,11 @@
             (BOOST_PP_ENUM_PARAMS(OPERATOR_ARGS,a))
 #endif
                 ;
-            return Function::operator()<N>(arg);
+            return Function::
+#ifndef BOOST_MSVC
+                             template
+#endif
+                             operator()<N>(arg);
         }
 #endif
 

Modified: sandbox/SOC/2007/signals/boost/dataflow/signals/component/multiplexer.hpp
==============================================================================
--- sandbox/SOC/2007/signals/boost/dataflow/signals/component/multiplexer.hpp	(original)
+++ sandbox/SOC/2007/signals/boost/dataflow/signals/component/multiplexer.hpp	2007-11-07 16:22:49 EST (Wed, 07 Nov 2007)
@@ -10,6 +10,7 @@
 #include <boost/dataflow/signals/component/conditional_templated.hpp>
 #include <boost/dataflow/signals/connection/slot_selector.hpp>
 
+#include <boost/config.hpp>
 #include <boost/fusion/container/map.hpp>
 
 #include <functional>
@@ -57,8 +58,17 @@
     {
         //return make_slot_selector<Signature> (&multiplexer::template operator()<N>, *this);
         return slot_map
-        (make_slot_selector<Signature> (&multiplexer::operator()<N>, *this),
-         make_slot_selector<typename base_type::fused_signature_type> (&multiplexer::operator()<N>, *this));
+        (make_slot_selector<Signature> (&multiplexer::
+#ifndef BOOST_MSVC
+                                                      template
+#endif
+                                                      operator()<N>, *this),
+         make_slot_selector<typename base_type::fused_signature_type>
+            (&multiplexer::
+#ifndef BOOST_MSVC
+                           template
+#endif            
+                           operator()<N>, *this));
 
     }
 };