Boost logo

Boost-Commit :

From: stipe_at_[hidden]
Date: 2008-02-09 14:54:49


Author: srajko
Date: 2008-02-09 14:54:48 EST (Sat, 09 Feb 2008)
New Revision: 43198
URL: http://svn.boost.org/trac/boost/changeset/43198

Log:
rename binary_operation template overload to default_binary_operation to fix MSVC problems
Text files modified:
   sandbox/SOC/2007/signals/boost/dataflow/signals/component/filter.hpp | 2 +-
   sandbox/SOC/2007/signals/boost/dataflow/support/binary_operation.hpp | 4 ++--
   sandbox/SOC/2007/signals/boost/dataflow/templates/binary_operation.hpp | 8 ++++----
   sandbox/SOC/2007/signals/libs/dataflow/test/signals/test_filter.cpp | 7 -------
   sandbox/SOC/2007/signals/libs/dataflow/test/test_binary_op.cpp | 2 +-
   sandbox/SOC/2007/signals/libs/dataflow/test/test_component.cpp | 2 +-
   6 files changed, 9 insertions(+), 16 deletions(-)

Modified: sandbox/SOC/2007/signals/boost/dataflow/signals/component/filter.hpp
==============================================================================
--- sandbox/SOC/2007/signals/boost/dataflow/signals/component/filter.hpp (original)
+++ sandbox/SOC/2007/signals/boost/dataflow/signals/component/filter.hpp 2008-02-09 14:54:48 EST (Sat, 09 Feb 2008)
@@ -156,7 +156,7 @@
     
     typedef typename boost::function_types::parameter_types<OutSignature>::type parameter_types;
     typedef typename boost::fusion::result_of::as_vector<parameter_types>::type parameter_vector;
- typedef typename filter::signal_type::result_type fused_signature_type (const parameter_vector &);
+ typedef typename filter<Derived, OutSignature, InSignatures, unfused, SignalArgs>::signal_type::result_type fused_signature_type (const parameter_vector &);
 
 protected:
     typename signal_from_args<fused_signature_type, SignalArgs>::type fusion_out;

Modified: sandbox/SOC/2007/signals/boost/dataflow/support/binary_operation.hpp
==============================================================================
--- sandbox/SOC/2007/signals/boost/dataflow/support/binary_operation.hpp (original)
+++ sandbox/SOC/2007/signals/boost/dataflow/support/binary_operation.hpp 2008-02-09 14:54:48 EST (Sat, 09 Feb 2008)
@@ -27,7 +27,7 @@
 
 template<typename Operation, typename Mechanism, typename Tag, typename OutgoingPort, typename IncomingPort>
 inline void
-binary_operation(OutgoingPort &left, IncomingPort &right)
+default_binary_operation(OutgoingPort &left, IncomingPort &right)
 {
     extension::binary_operation_impl<
         typename default_traits_of<OutgoingPort, args::left, Mechanism, Tag>::type,
@@ -49,7 +49,7 @@
> >::type
 connect(OutgoingPort &left, IncomingPort &right)
 {
- binary_operation<operations::connect, default_mechanism, default_tag>(left, right);
+ default_binary_operation<operations::connect, default_mechanism, default_tag>(left, right);
 }
 
 } } // namespace boost::dataflow

Modified: sandbox/SOC/2007/signals/boost/dataflow/templates/binary_operation.hpp
==============================================================================
--- sandbox/SOC/2007/signals/boost/dataflow/templates/binary_operation.hpp (original)
+++ sandbox/SOC/2007/signals/boost/dataflow/templates/binary_operation.hpp 2008-02-09 14:54:48 EST (Sat, 09 Feb 2008)
@@ -17,23 +17,23 @@
 template<typename Producer, typename Consumer>
 inline void DATAFLOW_TEMPLATE_BINARY_OPERATION(Producer &producer, Consumer &consumer)
 {
- boost::dataflow::binary_operation< boost::dataflow::operations::DATAFLOW_TEMPLATE_BINARY_OPERATION, DATAFLOW_TEMPLATE_MECHANISM, DATAFLOW_TEMPLATE_TAG >(producer, consumer);
+ boost::dataflow::default_binary_operation< boost::dataflow::operations::DATAFLOW_TEMPLATE_BINARY_OPERATION, DATAFLOW_TEMPLATE_MECHANISM, DATAFLOW_TEMPLATE_TAG >(producer, consumer);
 }
 
 template<typename Producer, typename Consumer>
 inline void DATAFLOW_TEMPLATE_BINARY_OPERATION(Producer &producer, const Consumer &consumer)
 {
- boost::dataflow::binary_operation< boost::dataflow::operations::DATAFLOW_TEMPLATE_BINARY_OPERATION, DATAFLOW_TEMPLATE_MECHANISM, DATAFLOW_TEMPLATE_TAG >(producer, consumer);
+ boost::dataflow::default_binary_operation< boost::dataflow::operations::DATAFLOW_TEMPLATE_BINARY_OPERATION, DATAFLOW_TEMPLATE_MECHANISM, DATAFLOW_TEMPLATE_TAG >(producer, consumer);
 }
 
 template<typename Producer, typename Consumer>
 inline void DATAFLOW_TEMPLATE_BINARY_OPERATION(const Producer &producer, Consumer &consumer)
 {
- boost::dataflow::binary_operation< boost::dataflow::operations::DATAFLOW_TEMPLATE_BINARY_OPERATION, DATAFLOW_TEMPLATE_MECHANISM, DATAFLOW_TEMPLATE_TAG >(producer, consumer);
+ boost::dataflow::default_binary_operation< boost::dataflow::operations::DATAFLOW_TEMPLATE_BINARY_OPERATION, DATAFLOW_TEMPLATE_MECHANISM, DATAFLOW_TEMPLATE_TAG >(producer, consumer);
 }
 
 template<typename Producer, typename Consumer>
 inline void DATAFLOW_TEMPLATE_BINARY_OPERATION(const Producer &producer, const Consumer &consumer)
 {
- boost::dataflow::binary_operation< boost::dataflow::operations::DATAFLOW_TEMPLATE_BINARY_OPERATION, DATAFLOW_TEMPLATE_MECHANISM, DATAFLOW_TEMPLATE_TAG >(producer, consumer);
+ boost::dataflow::default_binary_operation< boost::dataflow::operations::DATAFLOW_TEMPLATE_BINARY_OPERATION, DATAFLOW_TEMPLATE_MECHANISM, DATAFLOW_TEMPLATE_TAG >(producer, consumer);
 }

Modified: sandbox/SOC/2007/signals/libs/dataflow/test/signals/test_filter.cpp
==============================================================================
--- sandbox/SOC/2007/signals/libs/dataflow/test/signals/test_filter.cpp (original)
+++ sandbox/SOC/2007/signals/libs/dataflow/test/signals/test_filter.cpp 2008-02-09 14:54:48 EST (Sat, 09 Feb 2008)
@@ -64,13 +64,6 @@
         doubler1(1);
         
         BOOST_CHECK_EQUAL(collector.stored, 4);
- BOOST_CHECK_EQUAL((
- mpl::size<
- df::traits_of<
- df::result_of::get_port_c<DoublerClass, 1, df::signals::tag>::type,
- df::signals::tag
- >::type::ports
- >::value), 1);
         
         //]
     }

Modified: sandbox/SOC/2007/signals/libs/dataflow/test/test_binary_op.cpp
==============================================================================
--- sandbox/SOC/2007/signals/libs/dataflow/test/test_binary_op.cpp (original)
+++ sandbox/SOC/2007/signals/libs/dataflow/test/test_binary_op.cpp 2008-02-09 14:54:48 EST (Sat, 09 Feb 2008)
@@ -27,7 +27,7 @@
     BOOST_CHECK(disconnected);
     
     connected = false;
- df::binary_operation<df::operations::connect, whatever, df::default_tag>(p, c);
+ df::default_binary_operation<df::operations::connect, whatever, df::default_tag>(p, c);
     BOOST_CHECK(connected);
     
     return 0;

Modified: sandbox/SOC/2007/signals/libs/dataflow/test/test_component.cpp
==============================================================================
--- sandbox/SOC/2007/signals/libs/dataflow/test/test_component.cpp (original)
+++ sandbox/SOC/2007/signals/libs/dataflow/test/test_component.cpp 2008-02-09 14:54:48 EST (Sat, 09 Feb 2008)
@@ -78,7 +78,7 @@
 
     my_component c2;
     
- df::binary_operation<df::operations::connect, df::default_mechanism, df::default_tag>(c, c2);
+ df::default_binary_operation<df::operations::connect, df::default_mechanism, df::default_tag>(c, c2);
     BOOST_CHECK(connected);
     
     return 0;


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