From: g0dil <g0dil@270642c3-0616-0410-b53a-bc976706d245>
Date: Wed, 28 Jan 2009 13:16:37 +0000 (+0000)
Subject: Adjustment and fixes for boost-1.36 support
X-Git-Url: http://g0dil.de/git?a=commitdiff_plain;h=421d4e922c9856a80ed61c69db27504816180d99;p=senf.git

Adjustment and fixes for boost-1.36 support

git-svn-id: https://svn.berlios.de/svnroot/repos/senf/trunk@1086 270642c3-0616-0410-b53a-bc976706d245
---

diff --git a/Examples/psi2tsModule/main.test.cc b/Examples/psi2tsModule/main.test.cc
index 98362db..1c85532 100644
--- a/Examples/psi2tsModule/main.test.cc
+++ b/Examples/psi2tsModule/main.test.cc
@@ -33,6 +33,10 @@
 #define prefix_
 ///////////////////////////////cc.p////////////////////////////////////////
 
+BOOST_AUTO_UNIT_TEST(main)
+{
+    BOOST_CHECK( true );
+}
 
 ///////////////////////////////cc.e////////////////////////////////////////
 #undef prefix_
diff --git a/PPI/AnnotationRouter.test.cc b/PPI/AnnotationRouter.test.cc
index 8084a7a..6b55d73 100644
--- a/PPI/AnnotationRouter.test.cc
+++ b/PPI/AnnotationRouter.test.cc
@@ -41,6 +41,7 @@ namespace {
         int value;
         bool operator<(IntAnnotation const & other) const { return value < other.value; }
         bool operator==(IntAnnotation const & other) const { return value == other.value; }
+        IntAnnotation() {}
         IntAnnotation(int v) : value(v) {}
         IntAnnotation & operator=(int v) { value=v; return *this; }
         operator int () const { return value; }
diff --git a/PPI/main.test.cc b/PPI/main.test.cc
index b6d1686..a5b4f5c 100644
--- a/PPI/main.test.cc
+++ b/PPI/main.test.cc
@@ -33,6 +33,10 @@
 #define prefix_
 ///////////////////////////////cc.p////////////////////////////////////////
 
+BOOST_AUTO_UNIT_TEST(main)
+{
+    BOOST_CHECK( true );
+}
 
 ///////////////////////////////cc.e////////////////////////////////////////
 #undef prefix_
diff --git a/Packets/80211Bundle/main.test.cc b/Packets/80211Bundle/main.test.cc
index c6b4f24..30f5324 100644
--- a/Packets/80211Bundle/main.test.cc
+++ b/Packets/80211Bundle/main.test.cc
@@ -33,6 +33,10 @@
 #define prefix_
 ///////////////////////////////cc.p////////////////////////////////////////
 
+BOOST_AUTO_UNIT_TEST(main)
+{
+    BOOST_CHECK( true );
+}
 
 ///////////////////////////////cc.e////////////////////////////////////////
 #undef prefix_
diff --git a/Packets/80221Bundle/TLVPacket.test.cc b/Packets/80221Bundle/TLVPacket.test.cc
index 0e46beb..2ec504f 100644
--- a/Packets/80221Bundle/TLVPacket.test.cc
+++ b/Packets/80221Bundle/TLVPacket.test.cc
@@ -45,7 +45,7 @@ void check_TLVPacket(GenericTLVPacket &tlvPacket, boost::uint8_t type, boost::ui
 {
     BOOST_CHECK_EQUAL( tlvPacket->type(),         type   );
     BOOST_CHECK_EQUAL( tlvPacket->length(),       length );
-    BOOST_CHECK_EQUAL( tlvPacket->value().size(), length );
+    BOOST_CHECK_EQUAL( tlvPacket->value().size(), int(length) );
     senf::PacketData::iterator dataIterator (tlvPacket->value().begin());
     for (unsigned i=0; i<length; i++) {
         BOOST_CHECK_EQUAL( *dataIterator, i );
diff --git a/Packets/80221Bundle/main.test.cc b/Packets/80221Bundle/main.test.cc
index c6b4f24..30f5324 100644
--- a/Packets/80221Bundle/main.test.cc
+++ b/Packets/80221Bundle/main.test.cc
@@ -33,6 +33,10 @@
 #define prefix_
 ///////////////////////////////cc.p////////////////////////////////////////
 
+BOOST_AUTO_UNIT_TEST(main)
+{
+    BOOST_CHECK( true );
+}
 
 ///////////////////////////////cc.e////////////////////////////////////////
 #undef prefix_
diff --git a/Packets/DefaultBundle/extra_tests/main.test.cc b/Packets/DefaultBundle/extra_tests/main.test.cc
index b6d1686..a5b4f5c 100644
--- a/Packets/DefaultBundle/extra_tests/main.test.cc
+++ b/Packets/DefaultBundle/extra_tests/main.test.cc
@@ -33,6 +33,10 @@
 #define prefix_
 ///////////////////////////////cc.p////////////////////////////////////////
 
+BOOST_AUTO_UNIT_TEST(main)
+{
+    BOOST_CHECK( true );
+}
 
 ///////////////////////////////cc.e////////////////////////////////////////
 #undef prefix_
diff --git a/Packets/DefaultBundle/main.test.cc b/Packets/DefaultBundle/main.test.cc
index 65d49ba..11a08b5 100644
--- a/Packets/DefaultBundle/main.test.cc
+++ b/Packets/DefaultBundle/main.test.cc
@@ -33,6 +33,10 @@
 #define prefix_
 ///////////////////////////////cc.p////////////////////////////////////////
 
+BOOST_AUTO_UNIT_TEST(main)
+{
+    BOOST_CHECK( true );
+}
 
 ///////////////////////////////cc.e////////////////////////////////////////
 #undef prefix_
diff --git a/Packets/MPEGDVBBundle/main.test.cc b/Packets/MPEGDVBBundle/main.test.cc
index 4767620..4bee898 100644
--- a/Packets/MPEGDVBBundle/main.test.cc
+++ b/Packets/MPEGDVBBundle/main.test.cc
@@ -33,6 +33,10 @@
 #define prefix_
 ///////////////////////////////cc.p////////////////////////////////////////
 
+BOOST_AUTO_UNIT_TEST(main)
+{
+    BOOST_CHECK( true );
+}
 
 ///////////////////////////////cc.e////////////////////////////////////////
 #undef prefix_
diff --git a/Packets/Packet.test.cc b/Packets/Packet.test.cc
index e61d67a..bb0c7b0 100644
--- a/Packets/Packet.test.cc
+++ b/Packets/Packet.test.cc
@@ -283,16 +283,18 @@ BOOST_AUTO_UNIT_TEST(packetAnnotation)
 
 COMPILE_FAIL(invalidAnnotation)
 {
+#if 0 // The traits check fails for user defined but trivial constructors so ...
 #   ifdef BOOST_HAS_TYPE_TRAITS_INTRINSICS
 
     senf::Packet packet (FooPacket::create());
     (void) packet.annotation<InvalidAnnotation>();
 
 #   else
+#   endif
+#endif
 
     invalid_annotation_check_disabled();
 
-#   endif
 }
 
 #endif
diff --git a/Packets/PacketImpl.hh b/Packets/PacketImpl.hh
index de52e40..32ae5a1 100644
--- a/Packets/PacketImpl.hh
+++ b/Packets/PacketImpl.hh
@@ -97,6 +97,7 @@ namespace detail {
         static bool const Complex = boost::is_base_of<ComplexAnnotation, Annotation>::value;
         static bool const Small = (sizeof(Annotation) <= sizeof(AnnotationEntry) && ! Complex);
 
+#       if 0 // The test is difficult since it does not work with user-defined trivial constructors
 #       ifdef BOOST_HAS_TYPE_TRAITS_INTRINSICS
 
         BOOST_STATIC_ASSERT(( (boost::has_trivial_constructor<Annotation>::value 
@@ -104,6 +105,7 @@ namespace detail {
                               || Complex ));
 
 #       endif
+#       endif
     };
 
     template <class Annotation, bool Small = AnnotationIndexer<Annotation>::Small>
diff --git a/Packets/main.test.cc b/Packets/main.test.cc
index e5b17a4..f0b77ec 100644
--- a/Packets/main.test.cc
+++ b/Packets/main.test.cc
@@ -34,6 +34,10 @@
 #define prefix_
 ///////////////////////////////cc.p////////////////////////////////////////
 
+BOOST_AUTO_UNIT_TEST(main)
+{
+    BOOST_CHECK( true );
+}
 
 ///////////////////////////////cc.e////////////////////////////////////////
 #undef prefix_
diff --git a/Scheduler/Poller.test.cc b/Scheduler/Poller.test.cc
index f36cdff..35cb270 100644
--- a/Scheduler/Poller.test.cc
+++ b/Scheduler/Poller.test.cc
@@ -36,7 +36,9 @@
 ///////////////////////////////cc.p////////////////////////////////////////
 
 BOOST_AUTO_UNIT_TEST(poller)
-{}
+{
+    BOOST_CHECK( true );
+}
 
 ///////////////////////////////cc.e////////////////////////////////////////
 #undef prefix_
diff --git a/Scheduler/main.test.cc b/Scheduler/main.test.cc
index b6d1686..a5b4f5c 100644
--- a/Scheduler/main.test.cc
+++ b/Scheduler/main.test.cc
@@ -33,6 +33,10 @@
 #define prefix_
 ///////////////////////////////cc.p////////////////////////////////////////
 
+BOOST_AUTO_UNIT_TEST(main)
+{
+    BOOST_CHECK( true );
+}
 
 ///////////////////////////////cc.e////////////////////////////////////////
 #undef prefix_
diff --git a/Socket/Protocols/INet/main.test.cc b/Socket/Protocols/INet/main.test.cc
index 39abb0d..fc9cdb5 100644
--- a/Socket/Protocols/INet/main.test.cc
+++ b/Socket/Protocols/INet/main.test.cc
@@ -33,6 +33,10 @@
 #define prefix_
 ///////////////////////////////cc.p////////////////////////////////////////
 
+BOOST_AUTO_UNIT_TEST(main)
+{
+    BOOST_CHECK( true );
+}
 
 ///////////////////////////////cc.e////////////////////////////////////////
 #undef prefix_
diff --git a/Socket/Protocols/Raw/main.test.cc b/Socket/Protocols/Raw/main.test.cc
index 39abb0d..fc9cdb5 100644
--- a/Socket/Protocols/Raw/main.test.cc
+++ b/Socket/Protocols/Raw/main.test.cc
@@ -33,6 +33,10 @@
 #define prefix_
 ///////////////////////////////cc.p////////////////////////////////////////
 
+BOOST_AUTO_UNIT_TEST(main)
+{
+    BOOST_CHECK( true );
+}
 
 ///////////////////////////////cc.e////////////////////////////////////////
 #undef prefix_
diff --git a/Socket/Protocols/UN/main.test.cc b/Socket/Protocols/UN/main.test.cc
index 39abb0d..fc9cdb5 100644
--- a/Socket/Protocols/UN/main.test.cc
+++ b/Socket/Protocols/UN/main.test.cc
@@ -33,6 +33,10 @@
 #define prefix_
 ///////////////////////////////cc.p////////////////////////////////////////
 
+BOOST_AUTO_UNIT_TEST(main)
+{
+    BOOST_CHECK( true );
+}
 
 ///////////////////////////////cc.e////////////////////////////////////////
 #undef prefix_
diff --git a/Socket/Protocols/main.test.cc b/Socket/Protocols/main.test.cc
index c6b4f24..30f5324 100644
--- a/Socket/Protocols/main.test.cc
+++ b/Socket/Protocols/main.test.cc
@@ -33,6 +33,10 @@
 #define prefix_
 ///////////////////////////////cc.p////////////////////////////////////////
 
+BOOST_AUTO_UNIT_TEST(main)
+{
+    BOOST_CHECK( true );
+}
 
 ///////////////////////////////cc.e////////////////////////////////////////
 #undef prefix_
diff --git a/Socket/main.test.cc b/Socket/main.test.cc
index b6d1686..a5b4f5c 100644
--- a/Socket/main.test.cc
+++ b/Socket/main.test.cc
@@ -33,6 +33,10 @@
 #define prefix_
 ///////////////////////////////cc.p////////////////////////////////////////
 
+BOOST_AUTO_UNIT_TEST(main)
+{
+    BOOST_CHECK( true );
+}
 
 ///////////////////////////////cc.e////////////////////////////////////////
 #undef prefix_
diff --git a/Utils/Console/main.test.cc b/Utils/Console/main.test.cc
index c6b4f24..30f5324 100644
--- a/Utils/Console/main.test.cc
+++ b/Utils/Console/main.test.cc
@@ -33,6 +33,10 @@
 #define prefix_
 ///////////////////////////////cc.p////////////////////////////////////////
 
+BOOST_AUTO_UNIT_TEST(main)
+{
+    BOOST_CHECK( true );
+}
 
 ///////////////////////////////cc.e////////////////////////////////////////
 #undef prefix_
diff --git a/Utils/Daemon/main.test.cc b/Utils/Daemon/main.test.cc
index c6b4f24..30f5324 100644
--- a/Utils/Daemon/main.test.cc
+++ b/Utils/Daemon/main.test.cc
@@ -33,6 +33,10 @@
 #define prefix_
 ///////////////////////////////cc.p////////////////////////////////////////
 
+BOOST_AUTO_UNIT_TEST(main)
+{
+    BOOST_CHECK( true );
+}
 
 ///////////////////////////////cc.e////////////////////////////////////////
 #undef prefix_
diff --git a/Utils/Logger/main.test.cc b/Utils/Logger/main.test.cc
index c6b4f24..30f5324 100644
--- a/Utils/Logger/main.test.cc
+++ b/Utils/Logger/main.test.cc
@@ -33,6 +33,10 @@
 #define prefix_
 ///////////////////////////////cc.p////////////////////////////////////////
 
+BOOST_AUTO_UNIT_TEST(main)
+{
+    BOOST_CHECK( true );
+}
 
 ///////////////////////////////cc.e////////////////////////////////////////
 #undef prefix_
diff --git a/Utils/Termlib/Telnet.cc b/Utils/Termlib/Telnet.cc
index e833e3d..5c79e1f 100644
--- a/Utils/Termlib/Telnet.cc
+++ b/Utils/Termlib/Telnet.cc
@@ -350,7 +350,8 @@ prefix_ void senf::term::BaseTelnetProtocol::writeHandler(int state)
         return;
     }
     sendQueue_.erase(sendQueue_.begin(), 
-                     handle_.write(std::make_pair(sendQueue_.begin(), sendQueue_.end())));
+                     handle_.write(boost::make_iterator_range(
+                                       sendQueue_.begin(), sendQueue_.end())));
     if (sendQueue_.empty())
         outputEvent_.disable();
 }
diff --git a/Utils/Termlib/Telnet.test.cc b/Utils/Termlib/Telnet.test.cc
index 124897d..3a807ce 100644
--- a/Utils/Termlib/Telnet.test.cc
+++ b/Utils/Termlib/Telnet.test.cc
@@ -36,7 +36,9 @@
 ///////////////////////////////cc.p////////////////////////////////////////
 
 BOOST_AUTO_UNIT_TEST(telnet)
-{}
+{
+    BOOST_CHECK( true );
+}
 
 ///////////////////////////////cc.e////////////////////////////////////////
 #undef prefix_
diff --git a/Utils/Termlib/main.test.cc b/Utils/Termlib/main.test.cc
index c6b4f24..30f5324 100644
--- a/Utils/Termlib/main.test.cc
+++ b/Utils/Termlib/main.test.cc
@@ -33,6 +33,10 @@
 #define prefix_
 ///////////////////////////////cc.p////////////////////////////////////////
 
+BOOST_AUTO_UNIT_TEST(main)
+{
+    BOOST_CHECK( true );
+}
 
 ///////////////////////////////cc.e////////////////////////////////////////
 #undef prefix_
diff --git a/Utils/main.test.cc b/Utils/main.test.cc
index b6d1686..a5b4f5c 100644
--- a/Utils/main.test.cc
+++ b/Utils/main.test.cc
@@ -33,6 +33,10 @@
 #define prefix_
 ///////////////////////////////cc.p////////////////////////////////////////
 
+BOOST_AUTO_UNIT_TEST(main)
+{
+    BOOST_CHECK( true );
+}
 
 ///////////////////////////////cc.e////////////////////////////////////////
 #undef prefix_