fixes for g++ 4.5 (some members returned "the constructor, not the type")

[senf.git] / senf / PPI / Joins.test.cc

diff --git a/senf/PPI/Joins.test.cc b/senf/PPI/Joins.test.cc
index 772a761..6718448 100644 (file)
--- a/senf/PPI/Joins.test.cc
+++ b/senf/PPI/Joins.test.cc
@@ -36,7 +36,7 @@
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
-///////////////////////////////cc.p////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 
 namespace ppi = senf::ppi;
 namespace connector = ppi::connector;
@@ -52,7 +52,7 @@ namespace {
 
 }
 
-BOOST_AUTO_UNIT_TEST(passiveJoin)
+SENF_AUTO_UNIT_TEST(passiveJoin)
 {
     debug::ActiveSource source1;
     debug::ActiveSource source2;
@@ -74,7 +74,7 @@ BOOST_AUTO_UNIT_TEST(passiveJoin)
     sink.input.throttle();
     BOOST_CHECK( ! source1 );
     BOOST_CHECK( ! source2 );
-    
+
     source1.submit(p);
     source2.submit(p);
     BOOST_CHECK_EQUAL( sink.size(), 2u );
@@ -89,7 +89,7 @@ BOOST_AUTO_UNIT_TEST(passiveJoin)
     BOOST_CHECK_EQUAL( join.connectors().size(), 2u);
 }
 
-BOOST_AUTO_UNIT_TEST(priorityJoin)
+SENF_AUTO_UNIT_TEST(priorityJoin)
 {
     debug::PassiveSource source1;
     debug::PassiveSource source2;
@@ -105,7 +105,7 @@ BOOST_AUTO_UNIT_TEST(priorityJoin)
 
     senf::Packet p1 (senf::DataPacket::create());
     senf::Packet p2 (senf::DataPacket::create());
-    
+
     source1.submit(p1);
     BOOST_CHECK( sink );
     source2.submit(p2);
@@ -128,10 +128,10 @@ BOOST_AUTO_UNIT_TEST(priorityJoin)
     ppi::connect(source3, join, 0);
     ppi::connect(source4, join, -2);
     // Ordering now: source3, source1, source4, source2
- 
+
     senf::Packet p3 (senf::DataPacket::create());
     senf::Packet p4 (senf::DataPacket::create());
- 
+
     source4.submit(p4);
     source3.submit(p3);
     source2.submit(p2);
@@ -143,7 +143,46 @@ BOOST_AUTO_UNIT_TEST(priorityJoin)
     BOOST_CHECK( ! sink );
 }
 
-///////////////////////////////cc.e////////////////////////////////////////
+namespace {
+    struct ActiveJackSource
+    {
+        senf::ppi::connector::ActiveOutputJack<> output;
+
+        debug::ActiveSource source1;
+        debug::ActiveSource source2;
+
+        ActiveJackSource()
+            : output (source1.output) {}
+
+        void flip() {
+            output.reset( source2.output);
+        }
+    };
+}
+
+//SENF_AUTO_UNIT_TEST(jack_passiveJoin)
+//{
+//    ActiveJackSource jackSource;
+//    PassiveJoin join;
+//    debug::PassiveSink sink;
+//
+//    ppi::connect(jackSource, join);
+//    ppi::connect(join, sink);
+//    ppi::init();
+//
+//    senf::Packet p1 (senf::DataPacket::create());
+//    senf::Packet p2 (senf::DataPacket::create());
+//
+//    jackSource.source1.submit( p1);
+//    BOOST_CHECK_EQUAL( sink.pop_front(), p1);
+//
+//    jackSource.flip();
+//
+//    jackSource.source2.submit( p2);
+//    BOOST_CHECK_EQUAL( sink.pop_front(), p2);
+//}
+
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 #undef prefix_
 
 \f