// $Id$
//
// Copyright (C) 2007
-// Fraunhofer Institut fuer offene Kommunikationssysteme (FOKUS)
-// Kompetenzzentrum fuer Satelitenkommunikation (SatCom)
+// Fraunhofer Institute for Open Communication Systems (FOKUS)
+// Competence Center NETwork research (NET), St. Augustin, GERMANY
// Stefan Bund <g0dil@berlios.de>
//
// This program is free software; you can redistribute it and/or modify
// Custom includes
#include <deque>
-#include "../Utils/SafeBool.hh"
+#include "../Utils/safe_bool.hh"
#include "../Packets/Packets.hh"
#include "Module.hh"
#include "ActiveFeeder.hh"
-#include "../Utils/Logger.hh"
+#include "../Utils/Logger/SenfLog.hh"
//#include "DebugModules.mpp"
///////////////////////////////hh.p////////////////////////////////////////
*/
class ActiveSource
: public Module,
- public SafeBool<ActiveSource>
+ public safe_bool<ActiveSource>
{
SENF_PPI_MODULE(ActiveSource);
public:
- connector::ActiveOutput output;
+ connector::ActiveOutput<> output;
ActiveSource();
public:
typedef Queue::size_type size_type;
- connector::PassiveOutput output;
+ connector::PassiveOutput<> output;
PassiveSource();
*/
class ActiveSink
: public Module,
- public SafeBool<ActiveSink>
+ public safe_bool<ActiveSink>
{
SENF_PPI_MODULE(ActiveSink);
public:
- connector::ActiveInput input;
+ connector::ActiveInput<> input;
ActiveSink();
typedef Queue::size_type size_type;
typedef Queue::const_iterator iterator;
- connector::PassiveInput input;
+ connector::PassiveInput<> input;
PassiveSink();
public:
typedef PassiveSource::size_type size_type;
- connector::ActiveOutput & output;
+ connector::ActiveOutput<> & output;
ActiveFeederSource();
typedef PassiveSink::size_type size_type;
typedef PassiveSink::iterator iterator;
- connector::ActiveInput & input;
+ connector::ActiveInput<> & input;
ActiveFeederSink();
SENF_PPI_MODULE(LogSink);
public:
- connector::PassiveInput input;
+ connector::PassiveInput<> input;
LogSink();