Utils: Implement Tags.hh and move 'senf::noinit' and 'senf::nothrow' there

[senf.git] / Examples / DVBAdapter / ULEdec.cc

diff --git a/Examples/DVBAdapter/ULEdec.cc b/Examples/DVBAdapter/ULEdec.cc
index 8a00a30..abec6e4 100644 (file)
--- a/Examples/DVBAdapter/ULEdec.cc
+++ b/Examples/DVBAdapter/ULEdec.cc
@@ -1,9 +1,9 @@
 // $Id$
 //
 // Copyright (C) 2007
-// Fraunhofer Institut fuer offene Kommunikationssysteme (FOKUS)
-// Kompetenzzentrum fuer Satelitenkommunikation (SatCom)
-//     Thorsten Horstmann <thorsten.horstmann@fokus.fraunhofer.de>
+// Fraunhofer Institute for Open Communication Systems (FOKUS) 
+// Competence Center NETwork research (NET), St. Augustin, GERMANY 
+//     Thorsten Horstmann <tho@berlios.de>
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
@@ -24,6 +24,7 @@
 
 #include "ULEdec.hh"
 
+#include <cassert>
 #include <linux/dvb/dmx.h> 
 #include <boost/format.hpp>
 #include <senf/Packets.hh>
@@ -62,7 +63,7 @@ ULEdec::ULEdec(unsigned short adapter, unsigned short device)
 void ULEdec::handleEvent(senf::Scheduler::EventId event)
 {
     senf::TransportPacket ts_packet (
-            senf::TransportPacket::create(188, senf::TransportPacket::noinit));
+            senf::TransportPacket::create(188, senf::noinit));
     dvrHandle.read( ts_packet.data() );
    
     // Check TS error conditions: sync_byte, transport_error_indicator, scrambling_control.
@@ -115,7 +116,7 @@ void ULEdec::handleTSPacket(senf::TransportPacket ts_packet)
                     if ( (*payload_iter++ << 8 | *payload_iter++) != ULE_END_INDICATOR )
                         std::cerr << "delimiting error\n";
             } else {
-                BOOST_ASSERT( std::distance( payload_iter, payload_end ) == 0 );
+                assert( std::distance( payload_iter, payload_end ) == 0 );
             }
         }
         break;
@@ -143,7 +144,7 @@ void ULEdec::handleTSPacket(senf::TransportPacket ts_packet)
                 std::advance(payload_iter, payload_pointer);
             } else {
                 payload_iter = readContSNDUPacket( payload_iter, payload_end );
-                BOOST_ASSERT( isSDNUPacketComplete() );
+                assert( isSDNUPacketComplete() );
                 try {
                     handleSNDUPacket();
                 } catch (ULEdecException const & ex) {
@@ -158,7 +159,7 @@ void ULEdec::handleTSPacket(senf::TransportPacket ts_packet)
             do {
                 payload_iter = readNewSNDUPacket( payload_iter, payload_end );
                 if (! isSDNUPacketComplete()) {
-                    BOOST_ASSERT( std::distance( payload_iter, payload_end ) == 0 );
+                    assert( std::distance( payload_iter, payload_end ) == 0 );
                     this->receiver_state = Reassembly;
                     break;
                 }