Packets: Fix VariantParser invalid parser access bug
g0dil [Tue, 18 Nov 2008 16:04:20 +0000 (16:04 +0000)]
Clean up all file-defines and remove all tabs

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

242 files changed:
Examples/MultiMCLoop/MultiMCLoop.cc
Examples/psi2tsModule/psi2ts.hh
PPI/ActiveFeeder.hh
PPI/AnnotationRouter.hh
PPI/CloneSource.hh
PPI/Connectors.hh
PPI/Connectors.ih
PPI/DebugEvent.hh
PPI/DebugModules.hh
PPI/DiscardSink.hh
PPI/EventManager.hh
PPI/Events.hh
PPI/Events.ih
PPI/ForwardSwitch.hh
PPI/IOEvent.hh
PPI/IdleEvent.hh
PPI/IntervalTimer.hh
PPI/Joins.hh
PPI/Module.hh
PPI/Module.ih
PPI/ModuleManager.hh
PPI/PPI.hh
PPI/PassiveQueue.hh
PPI/Queueing.hh
PPI/RateFilter.hh
PPI/Route.hh
PPI/Route.ih
PPI/Setup.hh
PPI/SocketSink.hh
PPI/SocketSource.hh
PPI/ThrottleBarrier.hh
PPI/detail/Callback.hh
PPI/detail/EventBinding.hh
PPI/predecl.hh
Packets/ArrayParser.hh
Packets/ArrayParser.ih
Packets/AuxParser.hh
Packets/DataPacket.hh
Packets/DefaultBundle/EthernetPacket.hh
Packets/DefaultBundle/IPv4Packet.hh
Packets/DefaultBundle/IPv6Extensions.hh
Packets/DefaultBundle/IPv6Packet.hh
Packets/DefaultBundle/LlcSnapPacket.hh
Packets/DefaultBundle/RTPPacket.hh
Packets/DefaultBundle/UDPPacket.hh
Packets/IntParser.hh
Packets/IntParser.ih
Packets/ListBParser.hh
Packets/ListBParser.ih
Packets/ListNParser.hh
Packets/ListNParser.ih
Packets/ListParser.hh
Packets/ListParser.ih
Packets/MPEGDVBBundle/DTCPPacket.hh
Packets/MPEGDVBBundle/MPESection.hh
Packets/MPEGDVBBundle/SNDUPacket.hh
Packets/MPEGDVBBundle/TLVPacket.hh
Packets/MPEGDVBBundle/TransportPacket.hh
Packets/Packet.hh
Packets/PacketData.hh
Packets/PacketImpl.hh
Packets/PacketInterpreter.hh
Packets/PacketParser.hh
Packets/PacketParser.ih
Packets/PacketRegistry.hh
Packets/PacketRegistry.ih
Packets/PacketType.hh
Packets/PacketTypes.hh
Packets/Packets.hh
Packets/ParseHelpers.hh
Packets/ParseHelpers.ih
Packets/SafeIterator.cti
Packets/SafeIterator.hh
Packets/VariantParser.ct
Packets/VariantParser.hh
Packets/VariantParser.ih
Packets/VariantParser.test.cc
Packets/VectorParser.hh
Packets/VectorParser.ih
Packets/main.test.hh
Scheduler/ClockService.hh
Scheduler/Console/Config.hh
Scheduler/Console/Config.ih
Scheduler/Console/ConfigFile.hh
Scheduler/Console/ConfigFile.ih
Scheduler/Console/Console.hh
Scheduler/Console/Executor.hh
Scheduler/Console/LazyDirectory.hh
Scheduler/Console/Node.hh
Scheduler/Console/Node.ih
Scheduler/Console/OverloadedCommand.hh
Scheduler/Console/Parse.hh
Scheduler/Console/Parse.ih
Scheduler/Console/ParsedCommand.hh
Scheduler/Console/ParsedCommand.ih
Scheduler/Console/ProgramOptions.hh
Scheduler/Console/ProgramOptions.ih
Scheduler/Console/Readline.hh
Scheduler/Console/ScopedDirectory.hh
Scheduler/Console/Server.hh
Scheduler/Console/Server.ih
Scheduler/Console/Sysdir.hh
Scheduler/Console/Sysdir.ih
Scheduler/Console/Traits.hh
Scheduler/Console/Traits.ih
Scheduler/Console/Variables.hh
Scheduler/Console/Variables.ih
Scheduler/EventHook.hh
Scheduler/EventHook.ih
Scheduler/EventManager.hh
Scheduler/FIFORunner.hh
Scheduler/FdEvent.cc
Scheduler/FdEvent.cci
Scheduler/FdEvent.cti
Scheduler/FdEvent.hh
Scheduler/FdEvent.ih
Scheduler/FdManager.hh
Scheduler/Poller.hh
Scheduler/ReadHelper.hh
Scheduler/ReadHelper.ih
Scheduler/Scheduler.hh
Scheduler/SignalEvent.hh
Scheduler/SignalEvent.ih
Scheduler/TimerEvent.hh
Scheduler/TimerEvent.ih
Scheduler/WriteHelper.hh
Socket/AddressingPolicy.hh
Socket/ClientSocketHandle.hh
Socket/ClientSocketHandle.ih
Socket/CommunicationPolicy.hh
Socket/FileHandle.hh
Socket/FileHandle.ih
Socket/FramingPolicy.hh
Socket/NetdeviceController.hh
Socket/ProtocolClientSocketHandle.hh
Socket/ProtocolServerSocketHandle.hh
Socket/ProtocolServerSocketHandle.mpp
Socket/Protocols/AddressExceptions.hh
Socket/Protocols/BSDAddressingPolicy.hh
Socket/Protocols/BSDSocketAddress.hh
Socket/Protocols/BSDSocketProtocol.hh
Socket/Protocols/DVB/DVB.hh
Socket/Protocols/DVB/DVBDemuxHandles.hh
Socket/Protocols/DVB/DVBDemuxSocketProtocol.hh
Socket/Protocols/DVB/DVBFrontendHandle.cc
Socket/Protocols/DVB/DVBFrontendHandle.hh
Socket/Protocols/DatagramSocketProtocol.hh
Socket/Protocols/INet/ConnectedRawINetSocketHandle.hh
Socket/Protocols/INet/ConnectedUDPSocketHandle.hh
Socket/Protocols/INet/INet.hh
Socket/Protocols/INet/INet4Address.hh
Socket/Protocols/INet/INet6Address.hh
Socket/Protocols/INet/INet6Address.ih
Socket/Protocols/INet/INetAddressing.hh
Socket/Protocols/INet/INetSocketProtocol.hh
Socket/Protocols/INet/MulticastSocketProtocol.hh
Socket/Protocols/INet/RawINetSocketHandle.hh
Socket/Protocols/INet/RawINetSocketProtocol.hh
Socket/Protocols/INet/TCPSocketHandle.hh
Socket/Protocols/INet/TCPSocketProtocol.hh
Socket/Protocols/INet/UDPSocketHandle.hh
Socket/Protocols/INet/UDPSocketProtocol.hh
Socket/Protocols/Raw/LLAddressing.hh
Socket/Protocols/Raw/MACAddress.cc
Socket/Protocols/Raw/MACAddress.hh
Socket/Protocols/Raw/MACAddress.test.cc
Socket/Protocols/Raw/PacketSocketHandle.hh
Socket/Protocols/Raw/Raw.hh
Socket/Protocols/Raw/TunTapSocketHandle.hh
Socket/Protocols/UN/ConnectedUNDatagramSocketHandle.hh
Socket/Protocols/UN/UN.hh
Socket/Protocols/UN/UNAddressing.hh
Socket/Protocols/UN/UNDatagramSocketHandle.hh
Socket/Protocols/UN/UNSocketProtocol.hh
Socket/ReadWritePolicy.hh
Socket/ServerSocketHandle.hh
Socket/Socket.hh
Socket/SocketHandle.hh
Socket/SocketHandle.ih
Socket/SocketPolicy.hh
Socket/SocketPolicy.ih
Socket/SocketPolicy.test.hh
Socket/SocketProtocol.hh
Socket/SocketProtocol.test.hh
Utils/Backtrace.hh
Utils/Buffer.hh
Utils/Daemon/Daemon.hh
Utils/Daemon/Daemon.ih
Utils/Exception.hh
Utils/IpChecksum.hh
Utils/IteratorTraits.hh
Utils/IteratorTraits.ih
Utils/Logger/AreaRegistry.hh
Utils/Logger/AreaRegistry.ih
Utils/Logger/Config.hh
Utils/Logger/Config.ih
Utils/Logger/ConsoleTarget.hh
Utils/Logger/Definitions.hh
Utils/Logger/Definitions.ih
Utils/Logger/FileTarget.hh
Utils/Logger/IOStreamTarget.hh
Utils/Logger/Levels.hh
Utils/Logger/Levels.ih
Utils/Logger/Log.hh
Utils/Logger/Log.ih
Utils/Logger/Logger.hh
Utils/Logger/Parameters.hh
Utils/Logger/Parameters.ih
Utils/Logger/SenfLog.hh
Utils/Logger/StreamRegistry.hh
Utils/Logger/StreamRegistry.ih
Utils/Logger/StringTarget.hh
Utils/Logger/SyslogTarget.hh
Utils/Logger/Target.hh
Utils/Logger/Target.ih
Utils/Logger/TimeSource.hh
Utils/Logger/TimeSource.ih
Utils/Logger/main.test.hh
Utils/Phoenix.hh
Utils/Phoenix.ih
Utils/Range.hh
Utils/String.hh
Utils/Tags.hh
Utils/TypeIdValue.hh
Utils/TypeInfo.hh
Utils/auto_unit_test.hh
Utils/hexdump.hh
Utils/hexdump.ih
Utils/intrusive_refcount.hh
Utils/membind.hh
Utils/mpl.hh
Utils/mpl.ih
Utils/parameter.hh
Utils/pool_alloc_mixin.hh
Utils/preprocessor.hh
Utils/range.hh
Utils/safe_bool.hh
Utils/senfassert.hh
Utils/signalnames.hh
Utils/singleton.hh
Utils/type_traits.hh
project.el

index e598134..cba9bb9 100644 (file)
@@ -56,7 +56,7 @@ prefix_ MCReader::MCReader(unsigned n, std::string const & name_,
                            UDPSocket::Address const & group)
     : name (name_), socket (),
       event (name, senf::membind(&MCReader::handler, this), socket, 
-            senf::scheduler::FdEvent::EV_READ)
+             senf::scheduler::FdEvent::EV_READ)
 {
     socket.protocol().reuseaddr(true);
     socket.bind(group);
@@ -84,7 +84,7 @@ class MCWriter
     
 public:
     MCWriter(std::string const & name, UDPSocket::Address const & group, 
-            senf::ClockService::clock_type interval);
+             senf::ClockService::clock_type interval);
 };
 
 prefix_ MCWriter::MCWriter(std::string const & name_, UDPSocket::Address const & group_,
@@ -163,23 +163,23 @@ int main(int argc, char * argv[])
         senf::scheduler::SignalEvent sigint (SIGINT, &sigintHandler);
 
         UDPSocket::Address g1 ("225.1:43434");
-       UDPSocket::Address g2 ("225.2:43434");
+        UDPSocket::Address g2 ("225.2:43434");
 
-       MCReader r1g1 (1u, "r1g1", g1);
-       MCReader r2g1 (2u, "r2g1", g1);
-       MCReader r1g2 (3u, "r1g2", g2);
-       MCReader r2g2 (4u, "r2g2", g2);
+        MCReader r1g1 (1u, "r1g1", g1);
+        MCReader r2g1 (2u, "r2g1", g1);
+        MCReader r1g2 (3u, "r1g2", g2);
+        MCReader r2g2 (4u, "r2g2", g2);
 
-       MCWriter w1g1 ("w1g1", g1, senf::ClockService::milliseconds(600));
-       MCWriter w2g1 ("w2g1", g1, senf::ClockService::milliseconds(800));
-       MCWriter w1g2 ("w1g2", g2, senf::ClockService::milliseconds(700));
-       MCWriter w2g2 ("w2g2", g2, senf::ClockService::milliseconds(900));
+        MCWriter w1g1 ("w1g1", g1, senf::ClockService::milliseconds(600));
+        MCWriter w2g1 ("w2g1", g1, senf::ClockService::milliseconds(800));
+        MCWriter w1g2 ("w1g2", g2, senf::ClockService::milliseconds(700));
+        MCWriter w2g2 ("w2g2", g2, senf::ClockService::milliseconds(900));
 
-       senf::scheduler::process();
+        senf::scheduler::process();
     }
     catch (std::exception const & ex) {
-       std::cerr << ex.what() << "\n";
-       return 1;
+        std::cerr << ex.what() << "\n";
+        return 1;
     }
 };
 
index 14d25bd..141bfda 100644 (file)
@@ -23,8 +23,8 @@
 /** \file
     \brief psi2ts.hh public header */
 
-#ifndef HH_psi2ts_
-#define HH_psi2ts_ 1
+#ifndef HH_SENF_Examples_psi2tsModule_psi2ts_
+#define HH_SENF_Examples_psi2tsModule_psi2ts_ 1
 
 // Custom includes
 #include <senf/PPI/PPI.hh>
index 494f1ea..cc2ffc1 100644 (file)
@@ -23,8 +23,8 @@
 /** \file
     \brief ActiveFeeder public header */
 
-#ifndef HH_ActiveFeeder_
-#define HH_ActiveFeeder_ 1
+#ifndef HH_SENF_PPI_ActiveFeeder_
+#define HH_SENF_PPI_ActiveFeeder_ 1
 
 // Custom includes
 #include "Module.hh"
index 6b98b15..a186fd5 100644 (file)
@@ -23,8 +23,8 @@
 /** \file
     \brief AnnotationRouter public header */
 
-#ifndef HH_AnnotationRouter_
-#define HH_AnnotationRouter_ 1
+#ifndef HH_SENF_PPI_AnnotationRouter_
+#define HH_SENF_PPI_AnnotationRouter_ 1
 
 // Custom includes
 #include <boost/ptr_container/ptr_map.hpp>
index 6dd8000..3c767c9 100644 (file)
@@ -23,8 +23,8 @@
 /** \file
     \brief CloneSource public header */
 
-#ifndef HH_CloneSource_
-#define HH_CloneSource_ 1
+#ifndef HH_SENF_PPI_CloneSource_
+#define HH_SENF_PPI_CloneSource_ 1
 
 // Custom includes
 #include "../Packets/Packets.hh"
index e5ea9c9..07316b6 100644 (file)
@@ -23,8 +23,8 @@
 /** \file
     \brief Connectors public header */
 
-#ifndef HH_Connectors_
-#define HH_Connectors_ 1
+#ifndef HH_SENF_PPI_Connectors_
+#define HH_SENF_PPI_Connectors_ 1
 
 // Custom includes
 #include <deque>
index d2a8e4c..1a40ceb 100644 (file)
@@ -23,8 +23,8 @@
 /** \file
     \brief Connectors internal header */
 
-#ifndef IH_Connectors_
-#define IH_Connectors_ 1
+#ifndef IH_SENF_PPI_Connectors_
+#define IH_SENF_PPI_Connectors_ 1
 
 // Custom includes
 
index 9215d26..12268f6 100644 (file)
@@ -23,8 +23,8 @@
 /** \file
     \brief DebugEvent public header */
 
-#ifndef HH_DebugEvent_
-#define HH_DebugEvent_ 1
+#ifndef HH_SENF_PPI_DebugEvent_
+#define HH_SENF_PPI_DebugEvent_ 1
 
 // Custom includes
 #include "Events.hh"
index 85e51eb..b826447 100644 (file)
@@ -23,8 +23,8 @@
 /** \file
     \brief DebugModules public header */
 
-#ifndef HH_DebugModules_
-#define HH_DebugModules_ 1
+#ifndef HH_SENF_PPI_DebugModules_
+#define HH_SENF_PPI_DebugModules_ 1
 
 // Custom includes
 #include <deque>
index 39a16dd..3bce6ec 100644 (file)
@@ -23,8 +23,8 @@
 /** \file
     \brief DiscardSink public header */
 
-#ifndef HH_DiscardSink_
-#define HH_DiscardSink_ 1
+#ifndef HH_SENF_PPI_DiscardSink_
+#define HH_SENF_PPI_DiscardSink_ 1
 
 // Custom includes
 #include "Connectors.hh"
index d6de856..20535a0 100644 (file)
@@ -23,8 +23,8 @@
 /** \file
     \brief EventManager public header */
 
-#ifndef HH_EventManager_
-#define HH_EventManager_ 1
+#ifndef HH_SENF_PPI_EventManager_
+#define HH_SENF_PPI_EventManager_ 1
 
 // Custom includes
 #include <boost/ptr_container/ptr_vector.hpp>
index b3717bd..3f2fc25 100644 (file)
@@ -23,8 +23,8 @@
 /** \file
     \brief Events public header */
 
-#ifndef HH_Events_
-#define HH_Events_ 1
+#ifndef HH_SENF_PPI_Events_
+#define HH_SENF_PPI_Events_ 1
 
 // Custom includes
 #include <vector>
index a2354c8..8ce9616 100644 (file)
@@ -23,8 +23,8 @@
 /** \file
     \brief Events internal header */
 
-#ifndef IH_Events_
-#define IH_Events_ 1
+#ifndef IH_SENF_PPI_Events_
+#define IH_SENF_PPI_Events_ 1
 
 // Custom includes
 
index 2b2fa71..20649bf 100644 (file)
@@ -18,8 +18,8 @@
 // Free Software Foundation, Inc.,
 // 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-#ifndef FORWARDSWITCH_HH_
-#define FORWARDSWITCH_HH_
+#ifndef HH_SENF_PPI_ForwardSwitch_
+#define HH_SENF_PPI_ForwardSwitch_
 
 // Custom includes
 #include "Connectors.hh"
@@ -51,4 +51,4 @@ private:
 
 }}} //namespaces
 #include "ForwardSwitch.cci"
-#endif /*FORWARDSWITCH_HH_*/
+#endif /*HH_SENF_PPI_ForwardSwitch_*/
index d9d771d..7b3bf48 100644 (file)
@@ -23,8 +23,8 @@
 /** \file
     \brief IOEvent public header */
 
-#ifndef HH_IOEvent_
-#define HH_IOEvent_ 1
+#ifndef HH_SENF_PPI_IOEvent_
+#define HH_SENF_PPI_IOEvent_ 1
 
 // Custom includes
 #include "../Scheduler/Scheduler.hh"
index 51656ea..128dcba 100644 (file)
@@ -23,8 +23,8 @@
 /** \file
     \brief IdleEvent public header */
 
-#ifndef HH_IdleEvent_
-#define HH_IdleEvent_ 1
+#ifndef HH_SENF_PPI_IdleEvent_
+#define HH_SENF_PPI_IdleEvent_ 1
 
 // Custom includes
 #include "Events.hh"
index 1763f35..98228e4 100644 (file)
@@ -23,8 +23,8 @@
 /** \file
     \brief IntervalTimer public header */
 
-#ifndef HH_IntervalTimer_
-#define HH_IntervalTimer_ 1
+#ifndef HH_SENF_PPI_IntervalTimer_
+#define HH_SENF_PPI_IntervalTimer_ 1
 
 // Custom includes
 #include "../Scheduler/ClockService.hh"
index 77cb333..266e807 100644 (file)
@@ -23,8 +23,8 @@
 /** \file
     \brief Joins public header */
 
-#ifndef HH_Joins_
-#define HH_Joins_ 1
+#ifndef HH_SENF_PPI_Joins_
+#define HH_SENF_PPI_Joins_ 1
 
 // Custom includes
 #include <boost/ptr_container/ptr_vector.hpp>
index c2faf56..97f1c11 100644 (file)
@@ -24,8 +24,8 @@
     \brief Module public header 
 */
 
-#ifndef HH_Module_
-#define HH_Module_ 1
+#ifndef HH_SENF_PPI_Module_
+#define HH_SENF_PPI_Module_ 1
 
 // Custom includes
 #include <vector>
index 0538263..9d20812 100644 (file)
@@ -23,8 +23,8 @@
 /** \file
     \brief Module internal header */
 
-#ifndef IH_Module_
-#define IH_Module_ 1
+#ifndef IH_SENF_PPI_Module_
+#define IH_SENF_PPI_Module_ 1
 
 // Custom includes
 
index 76ba447..14ad1a9 100644 (file)
@@ -23,8 +23,8 @@
 /** \file
     \brief ModuleManager public header */
 
-#ifndef HH_ModuleManager_
-#define HH_ModuleManager_ 1
+#ifndef HH_SENF_PPI_ModuleManager_
+#define HH_SENF_PPI_ModuleManager_ 1
 
 // Custom includes
 #include <vector>
index 536a22e..c252245 100644 (file)
@@ -23,8 +23,8 @@
 /** \file
     \brief PPI public header */
 
-#ifndef HH_PPI_
-#define HH_PPI_ 1
+#ifndef HH_SENF_PPI_PPI_
+#define HH_SENF_PPI_PPI_ 1
 
 #include "all_includes.hh"
 
index 2412c4a..12cb25a 100644 (file)
@@ -23,8 +23,8 @@
 /** \file
     \brief PassiveQueue public header */
 
-#ifndef HH_PassiveQueue_
-#define HH_PassiveQueue_ 1
+#ifndef HH_SENF_PPI_PassiveQueue_
+#define HH_SENF_PPI_PassiveQueue_ 1
 
 // Custom includes
 #include "Connectors.hh"
index 16cecb4..5ed6a9f 100644 (file)
@@ -23,8 +23,8 @@
 /** \file
     \brief Queueing public header */
 
-#ifndef HH_Queueing_
-#define HH_Queueing_ 1
+#ifndef HH_SENF_PPI_Queueing_
+#define HH_SENF_PPI_Queueing_ 1
 
 // Custom includes
 #include "predecl.hh"
index 58f330b..bd68170 100644 (file)
@@ -17,8 +17,8 @@
 // along with this program; if not, write to the
 // Free Software Foundation, Inc.,
 // 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-#ifndef RATEFILTER_HH_
-#define RATEFILTER_HH_
+#ifndef HH_SENF_PPI_RateFilter_
+#define HH_SENF_PPI_RateFilter_
 
 // Custom includes
 #include "Connectors.hh"
@@ -49,4 +49,4 @@ private:
 
 }}} //namespaces
 
-#endif /*RATEFILTER_HH_*/
+#endif /*HH_SENF_PPI_RateFilter_*/
index fa59c96..fb29305 100644 (file)
@@ -23,8 +23,8 @@
 /** \file
     \brief Route public header */
 
-#ifndef HH_Route_
-#define HH_Route_ 1
+#ifndef HH_SENF_PPI_Route_
+#define HH_SENF_PPI_Route_ 1
 
 // Custom includes
 #include <boost/type_traits.hpp>
index 76125e3..31a4e5b 100644 (file)
@@ -23,8 +23,8 @@
 /** \file
     \brief Route internal header */
 
-#ifndef IH_Route_
-#define IH_Route_ 1
+#ifndef IH_SENF_PPI_Route_
+#define IH_SENF_PPI_Route_ 1
 
 // Custom includes
 #include <boost/type_traits/is_convertible.hpp>
index 021d528..9a06fa4 100644 (file)
@@ -23,8 +23,8 @@
 /** \file
     \brief Setup public header */
 
-#ifndef HH_Setup_
-#define HH_Setup_ 1
+#ifndef HH_SENF_PPI_Setup_
+#define HH_SENF_PPI_Setup_ 1
 
 // Custom includes
 #include <boost/type_traits.hpp>
index f7f61a5..a5c384b 100644 (file)
@@ -23,8 +23,8 @@
 /** \file
     \brief SocketSink public header */
 
-#ifndef HH_SocketSink_
-#define HH_SocketSink_ 1
+#ifndef HH_SENF_PPI_SocketSink_
+#define HH_SENF_PPI_SocketSink_ 1
 
 // Custom includes
 #include "../Packets/Packets.hh"
index a74fdbc..49c863f 100644 (file)
@@ -23,8 +23,8 @@
 /** \file
     \brief SocketSource public header */
 
-#ifndef HH_SocketSource_
-#define HH_SocketSource_ 1
+#ifndef HH_SENF_PPI_SocketSource_
+#define HH_SENF_PPI_SocketSource_ 1
 
 // Custom includes
 #include "../Packets/Packets.hh"
index a58935e..4addc83 100644 (file)
@@ -23,8 +23,8 @@
 /** \file
     \brief ThrottleBarrier public header */
 
-#ifndef HH_ThrottleBarrier_
-#define HH_ThrottleBarrier_ 1
+#ifndef HH_SENF_PPI_ThrottleBarrier_
+#define HH_SENF_PPI_ThrottleBarrier_ 1
 
 // Custom includes
 #include "Connectors.hh"
index f5b3cff..edecc0b 100644 (file)
@@ -23,8 +23,8 @@
 /** \file
     \brief Callback public header */
 
-#ifndef HH_Callback_
-#define HH_Callback_ 1
+#ifndef HH_SENF_PPI_detail_Callback_
+#define HH_SENF_PPI_detail_Callback_ 1
 
 // Custom includes
 #include <boost/function.hpp>
index 93089de..f489879 100644 (file)
@@ -23,8 +23,8 @@
 /** \file
     \brief EventBinding public header */
 
-#ifndef HH_EventBinding_
-#define HH_EventBinding_ 1
+#ifndef HH_SENF_PPI_detail_EventBinding_
+#define HH_SENF_PPI_detail_EventBinding_ 1
 
 // Custom includes
 #include "../../Scheduler/ClockService.hh"
index 7030072..ef6e17b 100644 (file)
@@ -23,8 +23,8 @@
 /** \file
     \brief predecl public header */
 
-#ifndef HH_predecl_
-#define HH_predecl_ 1
+#ifndef HH_SENF_PPI_predecl_
+#define HH_SENF_PPI_predecl_ 1
 
 // Custom includes
 
index ffe2cb0..0c11337 100644 (file)
@@ -23,8 +23,8 @@
 /** \file
     \brief ArrayParser public header */
 
-#ifndef HH_ArrayParser_
-#define HH_ArrayParser_ 1
+#ifndef HH_SENF_Packets_ArrayParser_
+#define HH_SENF_Packets_ArrayParser_ 1
 
 /** \defgroup parsecollection Collection parsers
 
@@ -114,8 +114,8 @@ namespace senf {
 
 ///////////////////////////////hh.e////////////////////////////////////////
 #endif
-#if !defined(HH_Packets__decls_) && !defined(HH_ArrayParser_i_)
-#define HH_ArrayParser_i_
+#if !defined(HH_SENF_Packets_Packets__decls_) && !defined(HH_SENF_Packets_ArrayParser_i_)
+#define HH_SENF_Packets_ArrayParser_i_
 //#include "ArrayParser.cci"
 #include "ArrayParser.ct"
 #include "ArrayParser.cti"
index 2dec0cc..bb97cef 100644 (file)
@@ -23,8 +23,8 @@
 /** \file
     \brief ArrayParser internal header */
 
-#ifndef IH_ArrayParser_
-#define IH_ArrayParser_ 1
+#ifndef IH_SENF_Packets_ArrayParser_
+#define IH_SENF_Packets_ArrayParser_ 1
 
 // Custom includes
 #include <boost/iterator/iterator_facade.hpp>
index fdf47c8..c76926c 100644 (file)
 /** \file
     \brief AuxParser public header */
 
-#ifndef HH_AuxParser_
-#define HH_AuxParser_ 1
+#ifndef HH_SENF_Packets_AuxParser_
+#define HH_SENF_Packets_AuxParser_ 1
 
-#ifndef HH_Packets_
+#ifndef HH_SENF_Packets_Packets_
 #error "Don't include 'AuxParser.hh' directly, include 'Packets.hh'"
 #endif
 
@@ -151,8 +151,8 @@ namespace detail {
 
 ///////////////////////////////hh.e////////////////////////////////////////
 #endif
-#if !defined(HH_Packets__decls_) && !defined(HH_AuxParser_i_)
-#define HH_AuxParser_i_
+#if !defined(HH_SENF_Packets_Packets__decls_) && !defined(HH_SENF_Packets_AuxParser_i_)
+#define HH_SENF_Packets_AuxParser_i_
 //#include "AuxParser.cci"
 //#include "AuxParser.ct"
 #include "AuxParser.cti"
index ae2b39e..fc8cd04 100644 (file)
@@ -23,8 +23,8 @@
 /** \file
     \brief DataPacket public header */
 
-#ifndef HH_DataPacket_
-#define HH_DataPacket_ 1
+#ifndef HH_SENF_Packets_DataPacket_
+#define HH_SENF_Packets_DataPacket_ 1
 
 // Custom includes
 #include "PacketType.hh"
@@ -58,8 +58,8 @@ namespace senf {
 
 ///////////////////////////////hh.e////////////////////////////////////////
 #endif
-#if !defined(HH_Packets__decls_) && !defined(HH_DataPacket_impl_)
-#define HH_DataPacket_impl_
+#if !defined(HH_SENF_Packets_Packets__decls_) && !defined(HH_SENF_Packets_DataPacket_impl_)
+#define HH_SENF_Packets_DataPacket_impl_
 //#include "DataPacket.cci"
 //#include "DataPacket.ct"
 //#include "DataPacket.cti"
index aadcdde..bac2554 100644 (file)
@@ -23,8 +23,8 @@
 /** \file
     \brief EthernetPacket public header */
 
-#ifndef HH_EthernetPacket_
-#define HH_EthernetPacket_ 1
+#ifndef HH_SENF_Packets_DefaultBundle_EthernetPacket_
+#define HH_SENF_Packets_DefaultBundle_EthernetPacket_ 1
 
 // Custom includes
 #include <algorithm>
index 496c9b8..c1e367b 100644 (file)
@@ -23,8 +23,8 @@
 /** \file
     \brief IPv4Packet public header */
 
-#ifndef HH_IPv4Packet_
-#define HH_IPv4Packet_ 1
+#ifndef HH_SENF_Packets_DefaultBundle_IPv4Packet_
+#define HH_SENF_Packets_DefaultBundle_IPv4Packet_ 1
 
 // Custom includes
 #include "../../Socket/Protocols/INet/INet4Address.hh"
index d40510a..91ac610 100644 (file)
@@ -23,8 +23,8 @@
 /** \file
     \brief IPv6Extensions public header */
 
-#ifndef HH_IPv6Extensions_
-#define HH_IPv6Extensions_ 1
+#ifndef HH_SENF_Packets_DefaultBundle_IPv6Extensions_
+#define HH_SENF_Packets_DefaultBundle_IPv6Extensions_ 1
 
 // Custom includes
 #include "IPv6Packet.hh"
index 4006918..63815d8 100644 (file)
@@ -23,8 +23,8 @@
 /** \file
     \brief IPv6Packet public header */
 
-#ifndef HH_IPv6Packet_
-#define HH_IPv6Packet_ 1
+#ifndef HH_SENF_Packets_DefaultBundle_IPv6Packet_
+#define HH_SENF_Packets_DefaultBundle_IPv6Packet_ 1
 
 // Custom includes
 #include "../../Socket/Protocols/INet/INet6Address.hh"
index d7d05b8..037b61f 100644 (file)
@@ -23,8 +23,8 @@
 /** \file
     \brief LLC/SNAP public header */
 
-#ifndef HH_LlcSnapPacket_
-#define HH_LlcSnapPacket_ 1
+#ifndef HH_SENF_Packets_DefaultBundle_LlcSnapPacket_
+#define HH_SENF_Packets_DefaultBundle_LlcSnapPacket_ 1
 
 // Custom includes
 #include <algorithm>
index cd17bc3..5a2785d 100644 (file)
@@ -23,8 +23,8 @@
 // Definition of non-inline non-template functions
 
 // Custom includes
-#ifndef RTPPACKET_HH_
-#define RTPPACKET_HH_
+#ifndef HH_SENF_Packets_DefaultBundle_RTPPacket_
+#define HH_SENF_Packets_DefaultBundle_RTPPacket_
 
 #include "../../Packets/Packets.hh"
 #include "../../Socket/Protocols/INet/INet6Address.hh"
index dc82ea2..8b1aa70 100644 (file)
@@ -23,8 +23,8 @@
 /** \file
     \brief UDPPacket public header */
 
-#ifndef HH_UDPPacket_
-#define HH_UDPPacket_ 1
+#ifndef HH_SENF_Packets_DefaultBundle_UDPPacket_
+#define HH_SENF_Packets_DefaultBundle_UDPPacket_ 1
 
 // Custom includes
 #include "../../Packets/Packets.hh"
index eb51170..4b4a985 100644 (file)
@@ -23,8 +23,8 @@
 /** \file
     \brief IntParser public header */
 
-#ifndef HH_IntParser_
-#define HH_IntParser_ 1
+#ifndef HH_SENF_Packets_IntParser_
+#define HH_SENF_Packets_IntParser_ 1
 
 // Custom includes
 #include <iostream>
@@ -494,8 +494,8 @@ namespace senf {
 
 ///////////////////////////////hh.e////////////////////////////////////////
 #endif
-#if !defined(HH_Packets__decls_) && !defined(HH_IntParser_i_)
-#define HH_IntParser_i_
+#if !defined(HH_SENF_Packets_Packets__decls_) && !defined(HH_SENF_Packets_IntParser_i_)
+#define HH_SENF_Packets_IntParser_i_
 //#include "IntParser.cci"
 //#include "IntParser.ct"
 //#include "IntParser.cti"
index fdc7b85..d496b73 100644 (file)
@@ -23,8 +23,8 @@
 /** \file
     \brief IntParser internal header */
 
-#ifndef IH_IntParser_
-#define IH_IntParser_ 1
+#ifndef IH_SENF_Packets_IntParser_
+#define IH_SENF_Packets_IntParser_ 1
 
 // Custom includes
 #include "PacketTypes.hh"
index 7b66813..76227c0 100644 (file)
@@ -23,8 +23,8 @@
 /** \file
     \brief ListBParser public header */
 
-#ifndef HH_ListBParser_
-#define HH_ListBParser_ 1
+#ifndef HH_SENF_Packets_ListBParser_
+#define HH_SENF_Packets_ListBParser_ 1
 
 // Custom includes
 #include "ListParser.hh"
@@ -38,8 +38,8 @@ namespace senf {
 
 ///////////////////////////////hh.e////////////////////////////////////////
 #endif
-#if !defined(HH_Packets__decls_) && !defined(HH_ListBParser_i_)
-#define HH_ListBParser_i_
+#if !defined(HH_SENF_Packets_Packets__decls_) && !defined(HH_SENF_Packets_ListBParser_i_)
+#define HH_SENF_Packets_ListBParser_i_
 //#include "ListBParser.cci"
 //#include "ListBParser.ct"
 #include "ListBParser.cti"
index 2396e1d..fe61177 100644 (file)
@@ -23,8 +23,8 @@
 /** \file
     \brief ListBParser internal header */
 
-#ifndef IH_ListBParser_
-#define IH_ListBParser_ 1
+#ifndef IH_SENF_Packets_ListBParser_
+#define IH_SENF_Packets_ListBParser_ 1
 
 // Custom includes
 #include "ListParser.ih"
index 2d96b56..8ee8124 100644 (file)
@@ -23,8 +23,8 @@
 /** \file
     \brief ListNParser public header */
 
-#ifndef HH_ListNParser_
-#define HH_ListNParser_ 1
+#ifndef HH_SENF_Packets_ListNParser_
+#define HH_SENF_Packets_ListNParser_ 1
 
 // Custom includes
 #include "ListParser.hh"
@@ -39,8 +39,8 @@ namespace senf {
 
 ///////////////////////////////hh.e////////////////////////////////////////
 #endif
-#if !defined(HH_Packets__decls_) && !defined(HH_ListNParser_i_)
-#define HH_ListNParser_i_
+#if !defined(HH_SENF_Packets_Packets__decls_) && !defined(HH_SENF_Packets_ListNParser_i_)
+#define HH_SENF_Packets_ListNParser_i_
 //#include "ListNParser.cci"
 #include "ListNParser.ct"
 #include "ListNParser.cti"
index 2931359..db54348 100644 (file)
@@ -23,8 +23,8 @@
 /** \file
     \brief ListNParser internal header */
 
-#ifndef IH_ListNParser_
-#define IH_ListNParser_ 1
+#ifndef IH_SENF_Packets_ListNParser_
+#define IH_SENF_Packets_ListNParser_ 1
 
 // Custom includes
 #include "ListParser.ih"
index 0382caa..004e77f 100644 (file)
@@ -23,8 +23,8 @@
 /** \file
     \brief ListParser public header */
 
-#ifndef HH_ListParser_
-#define HH_ListParser_ 1
+#ifndef HH_SENF_Packets_ListParser_
+#define HH_SENF_Packets_ListParser_ 1
 
 // Custom includes
 #include <boost/utility.hpp>
@@ -305,8 +305,8 @@ namespace senf {
 
 ///////////////////////////////hh.e////////////////////////////////////////
 #endif
-#if !defined(HH_Packets__decls_) && !defined(HH_ListParser_i_)
-#define HH_ListParser_i_
+#if !defined(HH_SENF_Packets_Packets__decls_) && !defined(HH_SENF_Packets_ListParser_i_)
+#define HH_SENF_Packets_ListParser_i_
 //#include "ListParser.cci"
 #include "ListParser.ct"
 #include "ListParser.cti"
index f756410..0be4b02 100644 (file)
@@ -23,8 +23,8 @@
 /** \file
     \brief ListParser internal header */
 
-#ifndef IH_ListParser_
-#define IH_ListParser_ 1
+#ifndef IH_SENF_Packets_ListParser_
+#define IH_SENF_Packets_ListParser_ 1
 
 // Custom includes
 #include <boost/iterator/iterator_facade.hpp>
index 128cac0..d3a8e05 100644 (file)
@@ -23,8 +23,8 @@
 /** \file
     \brief DTCPPacket public header */
 
-#ifndef HH_DTCPPacket_
-#define HH_DTCPPacket_ 1
+#ifndef HH_SENF_Packets_MPEGDVBBundle_DTCPPacket_
+#define HH_SENF_Packets_MPEGDVBBundle_DTCPPacket_ 1
 
 // Custom includes
 #include "../../Packets/Packets.hh"
index 702f546..7b7879d 100644 (file)
@@ -23,8 +23,8 @@
 /** \file
     \brief MPESection public header */
 
-#ifndef HH_MPESection_
-#define HH_MPESection_ 1
+#ifndef HH_SENF_Packets_MPEGDVBBundle_MPESection_
+#define HH_SENF_Packets_MPEGDVBBundle_MPESection_ 1
 
 // Custom includes
 #include <boost/crc.hpp>
index fbbd16b..4f296ac 100644 (file)
@@ -23,8 +23,8 @@
 /** \file
     \brief SNDUPacket public header */
 
-#ifndef HH_SNDUPacket_
-#define HH_SNDUPacket_ 1
+#ifndef HH_SENF_Packets_MPEGDVBBundle_SNDUPacket_
+#define HH_SENF_Packets_MPEGDVBBundle_SNDUPacket_ 1
 
 // Custom includes
 #include <algorithm>
index 4925075..f033a4d 100644 (file)
@@ -23,8 +23,8 @@
 /** \file
     \brief TLVPacket public header */
 
-#ifndef HH_TLVPacket_
-#define HH_TLVPacket_ 1
+#ifndef HH_SENF_Packets_MPEGDVBBundle_TLVPacket_
+#define HH_SENF_Packets_MPEGDVBBundle_TLVPacket_ 1
 
 // Custom includes
 #include <algorithm>
index 5ff4889..ae1f540 100644 (file)
@@ -23,8 +23,8 @@
 /** \file
     \brief TransportPacket public header */
 
-#ifndef HH_TransportPacket_
-#define HH_TransportPacket_ 1
+#ifndef HH_SENF_Packets_MPEGDVBBundle_TransportPacket_
+#define HH_SENF_Packets_MPEGDVBBundle_TransportPacket_ 1
 
 // Custom includes
 #include "../../Packets/Packets.hh"
index ac77eed..3d51f78 100644 (file)
@@ -23,8 +23,8 @@
 /** \file
     \brief Packet public header */
 
-#ifndef HH_Packet_
-#define HH_Packet_ 1
+#ifndef HH_SENF_Packets_Packet_
+#define HH_SENF_Packets_Packet_ 1
 
 // Custom includes
 #include <boost/operators.hpp>
@@ -727,8 +727,8 @@ namespace senf {
 
 ///////////////////////////////hh.e////////////////////////////////////////
 #endif
-#if !defined(HH_Packets__decls_) && !defined(HH_Packet_i_)
-#define HH_Packet_i_
+#if !defined(HH_SENF_Packets_Packets__decls_) && !defined(HH_SENF_Packets_Packet_i_)
+#define HH_SENF_Packets_Packet_i_
 #include "Packet.cci"
 #include "Packet.ct"
 #include "Packet.cti"
index d63e01a..7760200 100644 (file)
@@ -23,8 +23,8 @@
 /** \file
     \brief PacketData public header */
 
-#ifndef HH_PacketData_
-#define HH_PacketData_ 1
+#ifndef HH_SENF_Packets_PacketData_
+#define HH_SENF_Packets_PacketData_ 1
 
 // Custom includes
 #include <boost/utility.hpp>
@@ -166,8 +166,8 @@ namespace senf {
 
 ///////////////////////////////hh.e////////////////////////////////////////
 #endif
-#if !defined(HH_Packets__decls_) && !defined(HH_PacketData_i_)
-#define HH_PacketData_i_
+#if !defined(HH_SENF_Packets_Packets__decls_) && !defined(HH_SENF_Packets_PacketData_i_)
+#define HH_SENF_Packets_PacketData_i_
 #include "PacketData.cci"
 //#include "PacketData.ct"
 #include "PacketData.cti"
index 667eebb..1933949 100644 (file)
@@ -23,8 +23,8 @@
 /** \file
     \brief PacketImpl public header */
 
-#ifndef HH_PacketImpl_
-#define HH_PacketImpl_ 1
+#ifndef HH_SENF_Packets_PacketImpl_
+#define HH_SENF_Packets_PacketImpl_ 1
 
 // Custom includes
 #include <memory>
@@ -217,8 +217,8 @@ namespace detail {
 
 ///////////////////////////////hh.e////////////////////////////////////////
 #endif
-#if !defined(HH_Packets__decls_) && !defined(HH_PacketImpl_i_)
-#define HH_PacketImpl_i_
+#if !defined(HH_SENF_Packets_Packets__decls_) && !defined(HH_SENF_Packets_PacketImpl_i_)
+#define HH_SENF_Packets_PacketImpl_i_
 #include "PacketImpl.cci"
 //#include "PacketImpl.ct"
 #include "PacketImpl.cti"
index 790c600..66fc03f 100644 (file)
@@ -23,8 +23,8 @@
 /** \file
     \brief PacketInterpreter public header */
 
-#ifndef HH_PacketInterpreter_
-#define HH_PacketInterpreter_ 1
+#ifndef HH_SENF_Packets_PacketInterpreter_
+#define HH_SENF_Packets_PacketInterpreter_ 1
 
 // Custom includes
 #include "../boost/intrusive/ilist.hpp"
@@ -395,8 +395,8 @@ namespace senf {
 
 ///////////////////////////////hh.e////////////////////////////////////////
 #endif
-#if !defined(HH_Packets__decls_) && !defined(HH_PacketInterpreter_i_)
-#define HH_PacketInterpreter_i_
+#if !defined(HH_SENF_Packets_Packets__decls_) && !defined(HH_SENF_Packets_PacketInterpreter_i_)
+#define HH_SENF_Packets_PacketInterpreter_i_
 #include "PacketInterpreter.cci"
 #include "PacketInterpreter.ct"
 #include "PacketInterpreter.cti"
index 59124e3..8c218e0 100644 (file)
     <hr>
  */
 
-#ifndef HH_PacketParser_
-#define HH_PacketParser_ 1
+#ifndef HH_SENF_Packets_PacketParser_
+#define HH_SENF_Packets_PacketParser_ 1
 
 // Custom includes
 #include <boost/utility/enable_if.hpp>
@@ -499,8 +499,8 @@ namespace senf {
 
 ///////////////////////////////hh.e////////////////////////////////////////
 #endif
-#if !defined(HH_Packets__decls_) && !defined(HH_PacketParser_i_)
-#define HH_PacketParser_i_
+#if !defined(HH_SENF_Packets_Packets__decls_) && !defined(HH_SENF_Packets_PacketParser_i_)
+#define HH_SENF_Packets_PacketParser_i_
 #include "PacketParser.cci"
 #include "PacketParser.ct"
 #include "PacketParser.cti"
index 4596ea8..00df8a8 100644 (file)
@@ -23,8 +23,8 @@
 /** \file
     \brief PacketParser internal header */
 
-#ifndef IH_PacketParser_
-#define IH_PacketParser_ 1
+#ifndef IH_SENF_Packets_PacketParser_
+#define IH_SENF_Packets_PacketParser_ 1
 
 // Custom includes
 #include "../Utils/mpl.hh"
index a17449c..1fa7d99 100644 (file)
@@ -23,8 +23,8 @@
 /** \file
     \brief PacketRegistry public header */
 
-#ifndef HH_PacketRegistryImpl_
-#define HH_PacketRegistryImpl_ 1
+#ifndef HH_SENF_Packets_PacketRegistry_
+#define HH_SENF_Packets_PacketRegistry_ 1
 
 // Custom includes
 #include <map>
@@ -222,8 +222,8 @@ packet of which the key is requested
 
 ///////////////////////////////hh.e////////////////////////////////////////
 #endif
-#if !defined(HH_Packets__decls_) && !defined(HH_PacketRegistryImpl_i_)
-#define HH_PacketRegistryImpl_i_
+#if !defined(HH_SENF_Packets_Packets__decls_) && !defined(HH_SENF_Packets_PacketRegistry_i_)
+#define HH_SENF_Packets_PacketRegistry_i_
 #include "PacketRegistry.cci"
 #include "PacketRegistry.ct"
 #include "PacketRegistry.cti"
index 32139e7..af16278 100644 (file)
@@ -23,8 +23,8 @@
 /** \file
     \brief PacketRegistry internal header */
 
-#ifndef IH_PacketRegistryImpl_
-#define IH_PacketRegistryImpl_ 1
+#ifndef IH_SENF_Packets_PacketRegistry_
+#define IH_SENF_Packets_PacketRegistry_ 1
 
 // Custom includes
 #include <ext/functional>
index a5b671d..e97380b 100644 (file)
@@ -23,8 +23,8 @@
 /** \file
     \brief PacketType public header */
 
-#ifndef HH_PacketType_
-#define HH_PacketType_ 1
+#ifndef HH_SENF_Packets_PacketType_
+#define HH_SENF_Packets_PacketType_ 1
 
 // Custom includes
 #include <iostream>
@@ -358,8 +358,8 @@ namespace senf {
 
 ///////////////////////////////hh.e////////////////////////////////////////
 #endif
-#if !defined(HH_Packets__decls_) && !defined(HH_PacketType_i_)
-#define HH_PacketType_i_
+#if !defined(HH_SENF_Packets_Packets__decls_) && !defined(HH_SENF_Packets_PacketType_i_)
+#define HH_SENF_Packets_PacketType_i_
 #include "PacketType.cci"
 #include "PacketType.ct"
 #include "PacketType.cti"
index 3cf7a9c..fe229a6 100644 (file)
@@ -23,8 +23,8 @@
 /** \file
     \brief PacketTypes public header */
 
-#ifndef HH_PacketTypes_
-#define HH_PacketTypes_ 1
+#ifndef HH_SENF_Packets_PacketTypes_
+#define HH_SENF_Packets_PacketTypes_ 1
 
 // Custom includes
 #include <vector>
@@ -79,8 +79,8 @@ namespace test {
 
 ///////////////////////////////hh.e////////////////////////////////////////
 #endif
-#if !defined(HH_Packets__decls_) && !defined(HH_PacketTypes_i_)
-#define HH_PacketTypes_i_
+#if !defined(HH_SENF_Packets_Packets__decls_) && !defined(HH_SENF_Packets_PacketTypes_i_)
+#define HH_SENF_Packets_PacketTypes_i_
 //#include "PacketTypes.cci"
 //#include "PacketTypes.ct"
 //#include "PacketTypes.cti"
index 90036c0..ea0e318 100644 (file)
 /** \file
     \brief Packets public header */
 
-#ifndef HH_Packets_
-#define HH_Packets_ 1
+#ifndef HH_SENF_Packets_Packets_
+#define HH_SENF_Packets_Packets_ 1
 
-#define HH_Packets__decls_
+#define HH_SENF_Packets_Packets__decls_
 
 #include "PacketTypes.hh"
 #include "PacketImpl.hh"
@@ -47,7 +47,7 @@
 #include "ParseHelpers.hh"
 #include "DataPacket.hh"
 
-#undef HH_Packets__decls_
+#undef HH_SENF_Packets_Packets__decls_
 
 #include "PacketTypes.hh"
 #include "PacketImpl.hh"
index a8d5fbd..ef5ec45 100644 (file)
 /** \file
     \brief ParseHelpers public header */
 
-#ifndef HH_ParseHelpers_
-#define HH_ParseHelpers_ 1
+#ifndef HH_SENF_Packets_ParseHelpers_
+#define HH_SENF_Packets_ParseHelpers_ 1
 
-#ifndef HH_Packets_
+#ifndef HH_SENF_Packets_Packets_
 #error "Don't include 'ParseHelpers.hh' directly, include 'Packets.hh'"
 #endif
 
 
 ///////////////////////////////hh.e////////////////////////////////////////
 #endif
-#if !defined(HH_Packets__decls_) && !defined(HH_ParseHelpers_i_)
-#define HH_ParseHelpers_i_
+#if !defined(HH_SENF_Packets_Packets__decls_) && !defined(HH_SENF_Packets_ParseHelpers_i_)
+#define HH_SENF_Packets_ParseHelpers_i_
 //#include "ParseHelpers.cci"
 //#include "ParseHelpers.ct"
 //#include "ParseHelpers.cti"
index cdf8f74..6392b69 100644 (file)
           template <class T> T BOOST_PP_CAT(name, _dispatch)(boost::true_type) const              \
           { return parse<T>( SENF_PARSER_OFFSET(name) ); }                                        \
           template <class T> T BOOST_PP_CAT(name, _dispatch)(boost::false_type) const             \
-          { return parse<T>( BOOST_PP_CAT(aux,_)(), SENF_PARSER_OFFSET(name) ); }                                 \
+          { return parse<T>( BOOST_PP_CAT(aux,_)(), SENF_PARSER_OFFSET(name) ); }                 \
           BOOST_PP_CAT(name, _t) BOOST_PP_CAT(name, _)() const                                    \
           { return BOOST_PP_CAT(name, _dispatch) <BOOST_PP_CAT(name, _t)>(                        \
                   boost::integral_constant<bool, BOOST_PP_CAT(name, _aux_fixed)>()); }            \
index f845b78..a798945 100644 (file)
@@ -52,7 +52,7 @@ prefix_ senf::SafePacketParserWrapper<Parser> & senf::SafePacketParserWrapper<Pa
 }
 
 template <class Parser>
-prefix_ Parser senf::SafePacketParserWrapper<Parser>::operator*()
+prefix_ Parser & senf::SafePacketParserWrapper<Parser>::operator*()
     const
 {
     SENF_ASSERT( i_ );
@@ -61,7 +61,7 @@ prefix_ Parser senf::SafePacketParserWrapper<Parser>::operator*()
 }
 
 template <class Parser>
-prefix_ Parser const * senf::SafePacketParserWrapper<Parser>::operator->()
+prefix_ Parser * senf::SafePacketParserWrapper<Parser>::operator->()
     const
 {
     SENF_ASSERT( i_ );
index 44982a7..b0ff4bf 100644 (file)
 /** \file
     \brief SafeIterator public header */
 
-#ifndef HH_SafeIterator_
-#define HH_SafeIterator_ 1
+#ifndef HH_SENF_Packets_SafeIterator_
+#define HH_SENF_Packets_SafeIterator_ 1
 
-#ifndef HH_Packets_
+#ifndef HH_SENF_Packets_Packets_
 #error "Don't include 'SafeIterator.hh' directly, include 'Packets.hh'"
 #endif
 
@@ -142,10 +142,10 @@ namespace senf {
         ///@}
         ///////////////////////////////////////////////////////////////////////////
 
-        Parser operator*() const;       ///< Access the stored parser
+        Parser & operator*() const;       ///< Access the stored parser
                                         /**< On every access, the stored parsers iterator will be
                                              updated / re-validated. */
-        Parser const * operator->() const; ///< Access the stored parser
+        Parser * operator->() const; ///< Access the stored parser
                                         /**< On every access, the stored parsers iterator will be
                                              updated / re-validated. */
         bool boolean_test() const;      ///< Check validity
@@ -161,8 +161,8 @@ namespace senf {
 
 ///////////////////////////////hh.e////////////////////////////////////////
 #endif
-#if !defined(HH_Packets__decls_) && !defined(HH_SafeIterator_i_)
-#define HH_SafeIterator_i_
+#if !defined(HH_SENF_Packets_Packets__decls_) && !defined(HH_SENF_Packets_SafeIterator_i_)
+#define HH_SENF_Packets_SafeIterator_i_
 #include "SafeIterator.cci"
 //#include "SafeIterator.ct"
 #include "SafeIterator.cti"
index bae3139..b0ba3e8 100644 (file)
@@ -43,9 +43,10 @@ prefix_ void senf::VariantParser<AuxPolicy,Parsers>::init()
         std::advance(j, oldSize);
         std::fill(i(), j, 0u);
         safe_data_iterator safe_i (*this);
+        typename AuxPolicy::WrapperPolicy safeAux (static_cast<AuxPolicy&>(*this));
         data().insert(j, senf::init_bytes<NewParser>::value - oldSize, 0u);
-        AuxPolicy::aux(N, safe_i, state());
-        NewParser( AuxPolicy::adjust(safe_i, state()), state() ).init();
+        safeAux.aux(N, safe_i, state());
+        NewParser( safeAux.adjust(safe_i, state()), state() ).init();
     } else {
         data_iterator j (i());
         std::advance(j, senf::init_bytes<NewParser>::value);
index a76900e..17b0ca4 100644 (file)
 /** \file
     \brief VariantParser public header */
 
-#ifndef HH_VariantParser_
-#define HH_VariantParser_ 1
+#ifndef HH_SENF_Packets_VariantParser_
+#define HH_SENF_Packets_VariantParser_ 1
 
-#ifndef HH_Packets_
+#ifndef HH_SENF_Packets_Packets_
 #error "Don't include 'VariantParser.hh' directly, include 'Packets.hh'"
 #endif
 
@@ -257,8 +257,8 @@ namespace senf {
 
 ///////////////////////////////hh.e////////////////////////////////////////
 #endif
-#if !defined(HH_Packets__decls_) && !defined(HH_VariantParser_i_)
-#define HH_VariantParser_i_
+#if !defined(HH_SENF_Packets_Packets__decls_) && !defined(HH_SENF_Packets_VariantParser_i_)
+#define HH_SENF_Packets_VariantParser_i_
 //#include "VariantParser.cci"
 #include "VariantParser.ct"
 #include "VariantParser.cti"
index 275cff1..d667f86 100644 (file)
@@ -23,8 +23,8 @@
 /** \file
     \brief VariantParser internal header */
 
-#ifndef IH_VariantParser_
-#define IH_VariantParser_ 1
+#ifndef IH_SENF_Packets_VariantParser_
+#define IH_SENF_Packets_VariantParser_ 1
 
 // Custom includes
 #include "PacketParser.hh"
index 2ea65d4..1bf3254 100644 (file)
@@ -97,11 +97,18 @@ namespace VariantParser_test_cc_anon_namespace {
     {
 #       include SENF_PARSER()
 
-        SENF_PARSER_SKIP_BITS( 4 );
+        SENF_PARSER_BITFIELD_RO( len,  4, unsigned );
         SENF_PARSER_BITFIELD_RO( type, 4, unsigned );
+        // just here so the second variant is 'var'
+        SENF_PARSER_VARIANT( value, len, 
+                                 (senf::VoidPacketParser)
+                                 (senf::UInt8Parser)
+                                 (senf::UInt16Parser)
+                                 (senf::UInt32Parser)
+            );
         SENF_PARSER_VARIANT( content_, type,
-                                         ( novalue( nocontent, key(10, senf::VoidPacketParser)) )
-                                         (      id( content,           SubParser              ) )
+                                 ( novalue( nocontent, key(10, senf::VoidPacketParser) ) )
+                                 (      id( content,           SubParser               ) )
             );
 
         SENF_PARSER_FINALIZE(TestParser);
index b1254db..34b2c29 100644 (file)
@@ -23,8 +23,8 @@
 /** \file
     \brief VectorParser public header */
 
-#ifndef HH_VectorParser_
-#define HH_VectorParser_ 1
+#ifndef HH_SENF_Packets_VectorParser_
+#define HH_SENF_Packets_VectorParser_ 1
 
 // Custom includes
 #include <boost/iterator/iterator_facade.hpp>
@@ -291,8 +291,8 @@ namespace senf {
 
 ///////////////////////////////hh.e////////////////////////////////////////
 #endif
-#if !defined(HH_Packets__decls_) && !defined(HH_VectorParser_i_)
-#define HH_VectorParser_i_
+#if !defined(HH_SENF_Packets_Packets__decls_) && !defined(HH_SENF_Packets_VectorParser_i_)
+#define HH_SENF_Packets_VectorParser_i_
 //#include "VectorParser.cci"
 #include "VectorParser.ct"
 #include "VectorParser.cti"
index 6f82bc0..bd46aa1 100644 (file)
@@ -23,8 +23,8 @@
 /** \file
     \brief VectorParser internal header */
 
-#ifndef IH_VectorParser_
-#define IH_VectorParser_ 1
+#ifndef IH_SENF_Packets_VectorParser_
+#define IH_SENF_Packets_VectorParser_ 1
 
 // Custom includes
 
index b3a744c..ecd472c 100644 (file)
@@ -23,8 +23,8 @@
 /** \file
     \brief main.test public header */
 
-#ifndef HH_main_test_
-#define HH_main_test_ 1
+#ifndef HH_SENF_Packets_main_test_
+#define HH_SENF_PAckets_main_test_ 1
 
 // Custom includes
 
index bad8b6e..02082ea 100644 (file)
@@ -23,8 +23,8 @@
 /** \file
     \brief ClockService public header */
 
-#ifndef HH_ClockService_
-#define HH_ClockService_ 1
+#ifndef HH_SENF_Scheduler_ClockService_
+#define HH_SENF_Scheduler_ClockService_ 1
 
 // Custom includes
 #include <sys/time.h> 
index f5804b7..4ef6fb0 100644 (file)
@@ -23,8 +23,8 @@
 /** \file
     \brief Config public header */
 
-#ifndef HH_Console_Config_
-#define HH_Console_Config_ 1
+#ifndef HH_SENF_Scheduler_Console_Config_
+#define HH_SENF_Scheduler_Console_Config_ 1
 
 // Custom includes
 #include <boost/utility.hpp>
index 208abb2..bb0e55e 100644 (file)
@@ -23,8 +23,8 @@
 /** \file
     \brief Config internal header */
 
-#ifndef IH_Console_Config_
-#define IH_Console_Config_ 1
+#ifndef IH_SENF_Scheduler_Console_Config_
+#define IH_SENF_Scheduler_Console_Config_ 1
 
 // Custom includes
 #include <boost/utility.hpp>
index 8b5a291..15414fb 100644 (file)
@@ -23,8 +23,8 @@
 /** \file
     \brief ConfigFile public header */
 
-#ifndef HH_ConfigFile_
-#define HH_ConfigFile_ 1
+#ifndef HH_SENF_Scheduler_Console_ConfigFile_
+#define HH_SENF_Scheduler_Console_ConfigFile_ 1
 
 // Custom includes
 #include "Config.hh"
index 59df5a9..80191d0 100644 (file)
@@ -23,8 +23,8 @@
 /** \file
     \brief ConfigFile internal header */
 
-#ifndef IH_ConfigFile_
-#define IH_ConfigFile_ 1
+#ifndef IH_SENF_Scheduler_Console_ConfigFile_
+#define IH_SENF_Scheduler_Console_ConfigFile_ 1
 
 // Custom includes
 
index 66892a3..c75f995 100644 (file)
@@ -23,8 +23,8 @@
 /** \file
     \brief Console public header */
 
-#ifndef HH_Console_
-#define HH_Console_ 1
+#ifndef HH_SENF_Scheduler_Console_Console_
+#define HH_SENF_Scheduler_Console_Console_ 1
 
 // Custom includes
 
index 1f27f48..7538eff 100644 (file)
@@ -23,8 +23,8 @@
 /** \file
     \brief Executor public header */
 
-#ifndef HH_Executor_
-#define HH_Executor_ 1
+#ifndef HH_SENF_Scheduler_Console_Executor_
+#define HH_SENF_Scheduler_Console_Executor_ 1
 
 // Custom includes
 #include <boost/utility.hpp>
index 041bc42..38f0f0d 100644 (file)
@@ -23,8 +23,8 @@
 /** \file
     \brief LazyDirectory public header */
 
-#ifndef HH_LazyDirectory_
-#define HH_LazyDirectory_ 1
+#ifndef HH_SENF_Scheduler_Console_LazyDirectory_
+#define HH_SENF_Scheduler_Console_LazyDirectory_ 1
 
 // Custom includes
 #include <boost/utility.hpp>
index 05a4e92..8c4b668 100644 (file)
     class to add the node to the tree.
  */
 
-#ifndef HH_Node_
-#define HH_Node_ 1
+#ifndef HH_SENF_Scheduler_Console_Node_
+#define HH_SENF_Scheduler_Console_Node_ 1
 
 // Custom includes
 #include <map>
index 1a02bdd..421d744 100644 (file)
@@ -23,8 +23,8 @@
 /** \file
     \brief Node internal header */
 
-#ifndef IH_Node_
-#define IH_Node_ 1
+#ifndef IH_SENF_Scheduler_Console_Node_
+#define IH_SENF_Scheduler_Console_Node_ 1
 
 // Custom includes
 
index c39ff51..ee9bde9 100644 (file)
@@ -23,8 +23,8 @@
 /** \file
     \brief OverloadedCommand public header */
 
-#ifndef HH_OverloadedCommand_
-#define HH_OverloadedCommand_ 1
+#ifndef HH_SENF_Scheduler_Console_OverloadedCommand_
+#define HH_SENF_Scheduler_Console_OverloadedCommand_ 1
 
 // Custom includes
 #include "Node.hh"
index 59b0a3b..cfa871b 100644 (file)
@@ -23,8 +23,8 @@
 /** \file
     \brief Parse public header */
 
-#ifndef HH_Parse_
-#define HH_Parse_ 1
+#ifndef HH_SENF_Scheduler_Console_Parse_
+#define HH_SENF_Scheduler_Console_Parse_ 1
 
 /** \defgroup console_parser The parser
 
index 61c5cee..afb4b78 100644 (file)
@@ -23,8 +23,8 @@
 /** \file
     \brief Parse internal header */
 
-#ifndef IH_Parse_
-#define IH_Parse_ 1
+#ifndef IH_SENF_Scheduler_Console_Parse_
+#define IH_SENF_Scheduler_Console_Parse_ 1
 
 // Custom includes
 #include <vector>
index 6604dd3..4de6952 100644 (file)
@@ -23,8 +23,8 @@
 /** \file
     \brief ParsedCommand public header */
 
-#ifndef HH_ParsedCommand_
-#define HH_ParsedCommand_ 1
+#ifndef HH_SENF_Scheduler_Console_ParsedCommand_
+#define HH_SENF_Scheduler_Console_ParsedCommand_ 1
 
 // Custom includes
 
index c339445..0e22021 100644 (file)
@@ -23,8 +23,8 @@
 /** \file
     \brief ParsedCommand internal header */
 
-#ifndef IH_ParsedCommand_
-#define IH_ParsedCommand_ 1
+#ifndef IH_SENF_Scheduler_Console_ParsedCommand_
+#define IH_SENF_Scheduler_Console_ParsedCommand_ 1
 
 // Custom includes
 #include <boost/function.hpp>
index d8f819e..2f985f3 100644 (file)
@@ -23,8 +23,8 @@
 /** \file
     \brief ProgramOptions public header */
 
-#ifndef HH_ProgramOptions_
-#define HH_ProgramOptions_ 1
+#ifndef HH_SENF_Scheduler_Console_ProgramOptions_
+#define HH_SENF_Scheduler_Console_ProgramOptions_ 1
 
 // Custom includes
 #include "Config.hh"
index d99d899..7bbbf0c 100644 (file)
@@ -23,8 +23,8 @@
 /** \file
     \brief ProgramOptions internal header */
 
-#ifndef IH_ProgramOptions_
-#define IH_ProgramOptions_ 1
+#ifndef IH_SENF_Scheduler_Console_ProgramOptions_
+#define IH_SENF_Scheduler_Console_ProgramOptions_ 1
 
 // Custom includes
 #include <boost/scoped_ptr.hpp>
index 3daf490..2b6a672 100644 (file)
@@ -23,8 +23,8 @@
 /** \file
     \brief Readline public header */
 
-#ifndef HH_Readline_
-#define HH_Readline_ 1
+#ifndef HH_SENF_Scheduler_Console_Readline_
+#define HH_SENF_Scheduler_Console_Readline_ 1
 
 // Custom includes
 #include <boost/scoped_ptr.hpp>
index f82375a..512386e 100644 (file)
@@ -23,8 +23,8 @@
 /** \file
     \brief ScopedDirectory public header */
 
-#ifndef HH_ScopedDirectory_
-#define HH_ScopedDirectory_ 1
+#ifndef HH_SENF_Scheduler_Console_ScopedDirectory_
+#define HH_SENF_Scheduler_Console_ScopedDirectory_ 1
 
 // Custom includes
 #include <boost/utility.hpp>
index 7ccf284..dfd0cf3 100644 (file)
@@ -23,8 +23,8 @@
 /** \file
     \brief Server public header */
 
-#ifndef HH_Server_
-#define HH_Server_ 1
+#ifndef HH_SENF_Scheduler_Console_Server_
+#define HH_SENF_Scheduler_Console_Server_ 1
 
 // Custom includes
 #include <set>
index 332512a..9db9d4c 100644 (file)
@@ -23,8 +23,8 @@
 /** \file
     \brief Server internal header */
 
-#ifndef IH_Server_
-#define IH_Server_ 1
+#ifndef IH_SENF_Scheduler_Console_Server_
+#define IH_SENF_Scheduler_Console_Server_ 1
 
 // Custom includes
 #include <boost/iostreams/concepts.hpp>
index 06fb086..fca5601 100644 (file)
@@ -23,8 +23,8 @@
 /** \file
     \brief Sysdir public header */
 
-#ifndef HH_Sysdir_
-#define HH_Sysdir_ 1
+#ifndef HH_SENF_Scheduler_Console_Sysdir_
+#define HH_SENF_Scheduler_Console_Sysdir_ 1
 
 // Custom includes
 #include "Node.hh"
index 56ab1fc..3e89534 100644 (file)
@@ -23,8 +23,8 @@
 /** \file
     \brief Sysdir internal header */
 
-#ifndef IH_Sysdir_
-#define IH_Sysdir_ 1
+#ifndef IH_SENF_Scheduler_Console_Sysdir_
+#define IH_SENF_Scheduler_Console_Sysdir_ 1
 
 // Custom includes
 
index 900b2b1..d479f45 100644 (file)
@@ -23,8 +23,8 @@
 /** \file
     \brief Traits public header */
 
-#ifndef HH_Traits_
-#define HH_Traits_ 1
+#ifndef HH_SENF_Scheduler_Console_Traits_
+#define HH_SENF_Scheduler_Console_Traits_ 1
 
 // Custom includes
 #include <iostream>
index 7d97e70..b9f3b1b 100644 (file)
@@ -23,8 +23,8 @@
 /** \file
     \brief Traits internal header */
 
-#ifndef IH_Traits_
-#define IH_Traits_ 1
+#ifndef IH_SENF_Scheduler_Console_Traits_
+#define IH_SENF_Scheduler_Console_Traits_ 1
 
 // Custom includes
 #include <string>
index d8a9468..2ce1dd2 100644 (file)
@@ -23,8 +23,8 @@
 /** \file
     \brief Variables public header */
 
-#ifndef HH_Variables_
-#define HH_Variables_ 1
+#ifndef HH_SENF_Scheduler_Console_Variables_
+#define HH_SENF_Scheduler_Console_Variables_ 1
 
 // Custom includes
 #include <boost/utility.hpp>
index 3772fd0..0f703aa 100644 (file)
@@ -23,8 +23,8 @@
 /** \file
     \brief Variables internal header */
 
-#ifndef IH_Variables_
-#define IH_Variables_ 1
+#ifndef IH_SENF_Scheduler_Console_Variables_
+#define IH_SENF_Scheduler_Console_Variables_ 1
 
 // Custom includes
 #include <boost/function.hpp>
index d59414f..4437780 100644 (file)
@@ -23,8 +23,8 @@
 /** \file
     \brief EventHook public header */
 
-#ifndef HH_EventHook_
-#define HH_EventHook_ 1
+#ifndef HH_SENF_Scheduler_EventHook_
+#define HH_SENF_Scheduler_EventHook_ 1
 
 // Custom includes
 #include <boost/function.hpp>
index e526bce..2bed1bb 100644 (file)
@@ -23,8 +23,8 @@
 /** \file
     \brief EventHook internal header */
 
-#ifndef IH_EventHook_
-#define IH_EventHook_ 1
+#ifndef IH_SENF_Scheduler_EventHook_
+#define IH_SENF_Scheduler_EventHook_ 1
 
 // Custom includes
 #include "../Utils/singleton.hh"
index f08f019..3c156fe 100644 (file)
@@ -23,8 +23,8 @@
 /** \file
     \brief EventManager public header */
 
-#ifndef HH_SchedulerEventManager_
-#define HH_SchedulerEventManager_ 1
+#ifndef HH_SENF_Scheduler_EventManager_
+#define HH_SENF_Scheduler_EventManager_ 1
 
 // Custom includes
 #include <string>
index 8803f75..11ab3ee 100644 (file)
@@ -23,8 +23,8 @@
 /** \file
     \brief FIFORunner public header */
 
-#ifndef HH_FIFORunner_
-#define HH_FIFORunner_ 1
+#ifndef HH_SENF_Scheduler_FIFORunner_
+#define HH_SENF_Scheduler_FIFORunner_ 1
 
 // Custom includes
 #include <signal.h>
index e3500ca..afe10c7 100644 (file)
@@ -50,9 +50,9 @@ prefix_ bool senf::scheduler::detail::FdDispatcher::add(FdEvent & event)
     std::pair<FdSet::iterator,FdSet::iterator> range (fds_.equal_range(event));
     int events (0);
     for (FdSet::iterator i (range.first); i != range.second; ++i)
-       events |= i->events_;
+        events |= i->events_;
     if (event.events_ & events)
-       throw FdEvent::DuplicateEventRegistrationException();
+        throw FdEvent::DuplicateEventRegistrationException();
 
     if (! detail::FdManager::instance().set(event.fd_, events | event.events_, &event))
         return false;
@@ -70,12 +70,12 @@ prefix_ void senf::scheduler::detail::FdDispatcher::remove(FdEvent & event)
 
     std::pair<FdSet::iterator,FdSet::iterator> range (fds_.equal_range(event));
     if (range.first == range.second)
-       detail::FdManager::instance().remove(event.fd_);
+        detail::FdManager::instance().remove(event.fd_);
     else {
         int events (0);
         for (FdSet::iterator i (range.first); i != range.second; ++i)
             events |= i->events_;
-       detail::FdManager::instance().set(event.fd_, events, &(*range.first));
+        detail::FdManager::instance().set(event.fd_, events, &(*range.first));
     }
 }
 
@@ -87,9 +87,9 @@ prefix_ void senf::scheduler::detail::FileDispatcher::add(FdEvent & event)
     std::pair<FdSet::iterator,FdSet::iterator> range (fds_.equal_range(event));
     int events (0);
     for (FdSet::iterator i (range.first); i != range.second; ++i)
-       events |= i->events_;
+        events |= i->events_;
     if (event.events_ & events)
-       throw FdEvent::DuplicateEventRegistrationException();
+        throw FdEvent::DuplicateEventRegistrationException();
 
     detail::FIFORunner::instance().enqueue(&event);
     fds_.insert(range.first, event);
@@ -153,7 +153,7 @@ prefix_ senf::scheduler::FdEvent & senf::scheduler::FdEvent::events(int events)
     disable();
     events_ = events;
     if (en)
-       enabled();
+        enabled();
     return *this;
 }
 
@@ -163,9 +163,9 @@ prefix_ void senf::scheduler::FdEvent::signal(int events)
     detail::FdDispatcher::FdSet::iterator const i_end (detail::FdDispatcher::instance().fds_.end());
     bool all ((events & (EV_ERR | EV_HUP)) && ! (events & (EV_READ | EV_PRIO | EV_WRITE)));
     for (; i != i_end && fd_ == i->fd_; ++i) {
-       i->signaledEvents_ = events;
-       if (i->events_ & events || all)
-           i->setRunnable();
+        i->signaledEvents_ = events;
+        if (i->events_ & events || all)
+            i->setRunnable();
     }
 }
 
index 9404a5c..9efe737 100644 (file)
@@ -42,7 +42,7 @@ prefix_ senf::scheduler::FdEvent::FdEvent(std::string const & name, Callback con
 prefix_ senf::scheduler::FdEvent::~FdEvent()
 {
     if (detail::FdDispatcher::alive())
-       disable();
+        disable();
 }
 
 prefix_ senf::scheduler::FdEvent & senf::scheduler::FdEvent::action(Callback const & cb)
index 317a4eb..ff752bc 100644 (file)
@@ -41,7 +41,7 @@ prefix_ senf::scheduler::FdEvent::FdEvent(std::string const & name, Callback con
       pollable_ (true), events_ (events)
 {
     if (initiallyEnabled)
-       enable();
+        enable();
 }
 
 ///////////////////////////////////////////////////////////////////////////
index 6080d0d..1c05878 100644 (file)
@@ -23,8 +23,8 @@
 /** \file
     \brief FdDispatcher public header */
 
-#ifndef HH_FdDispatcher_
-#define HH_FdDispatcher_ 1
+#ifndef HH_SENF_Scheduler_FdEvent_
+#define HH_SENF_Scheduler_FdEvent_ 1
 
 // Custom includes
 #include "../boost/intrusive/iset_hook.hpp"
@@ -39,8 +39,8 @@ namespace senf {
 namespace scheduler {
 
     namespace detail {
-       struct FdSetTag;
-       typedef boost::intrusive::iset_base_hook<FdSetTag> FdSetBase;
+        struct FdSetTag;
+        typedef boost::intrusive::iset_base_hook<FdSetTag> FdSetBase;
         struct FdSetCompare;
         struct FindFd;
         class FdDispatcher;
@@ -80,15 +80,15 @@ namespace scheduler {
         member function it should be defined as a class member).
      */
     class FdEvent
-       : public detail::FIFORunner::TaskInfo,
-         public detail::FdSetBase,
-         public detail::FdManager::Event
+        : public detail::FIFORunner::TaskInfo,
+          public detail::FdSetBase,
+          public detail::FdManager::Event
     {
     public: 
         ///////////////////////////////////////////////////////////////////////////
         // Types
 
-       typedef boost::function<void (int)> Callback;
+        typedef boost::function<void (int)> Callback;
 
         enum Events { 
             EV_NONE = 0                             ///< No event
@@ -107,8 +107,8 @@ namespace scheduler {
         ///@{
 
         template <class Handle>
-       FdEvent(std::string const & name, Callback const & cb, Handle const & handle, int events,
-               bool initiallyEnabled = true);
+        FdEvent(std::string const & name, Callback const & cb, Handle const & handle, int events,
+                bool initiallyEnabled = true);
                                         ///< Register a file descriptor event
                                         /**< Registers \a cb to be called when any of the \a events
                                              occurs on \a handle. If \a initiallyEnabled is set \c
@@ -131,17 +131,17 @@ namespace scheduler {
                                              \param[in] cb Callback to call. This callback may \e
                                                  explicitly be set to \c 0 if the value cannot be
                                                  initialized. */
-       ~FdEvent();
+        ~FdEvent();
         
         ///@}
         ///////////////////////////////////////////////////////////////////////////
 
-       void disable();                 ///< Disable event
-       void enable();                  ///< Enable event
+        void disable();                 ///< Disable event
+        void enable();                  ///< Enable event
 
-       FdEvent & action(Callback const & cb); ///< Change event callback
+        FdEvent & action(Callback const & cb); ///< Change event callback
 
-       FdEvent & events(int events);   ///< Change event mask
+        FdEvent & events(int events);   ///< Change event mask
         FdEvent & addEvents(int events); ///< Add additional events to event mask
         FdEvent & removeEvents(int events); ///< Remove events from event mask
         int events();                   ///< Current event mask
@@ -155,16 +155,16 @@ namespace scheduler {
     protected:
 
     private:
-       virtual void signal(int events);
-       virtual void v_run();
+        virtual void signal(int events);
+        virtual void v_run();
         virtual char const * v_type() const;
         virtual std::string v_info() const;
 
-       Callback cb_;
-       int fd_;
+        Callback cb_;
+        int fd_;
         bool pollable_;
-       int events_;
-       int signaledEvents_;
+        int events_;
+        int signaledEvents_;
 
         friend class detail::FdSetCompare;
         friend class detail::FindFd;
index bcb98a9..940a057 100644 (file)
@@ -23,8 +23,8 @@
 /** \file
     \brief FdDispatcher internal header */
 
-#ifndef IH_FdDispatcher_
-#define IH_FdDispatcher_ 1
+#ifndef IH_SENF_Scheduler_FdEvent_
+#define IH_SENF_Scheduler_FdEvent_ 1
 
 // Custom includes
 #include "../boost/intrusive/iset.hpp"
@@ -39,24 +39,24 @@ namespace scheduler {
 namespace detail {
 
     struct FdSetCompare {
-       bool operator()(FdEvent const & a, FdEvent const & b) const
-       { return a.fd_ < b.fd_; }
+        bool operator()(FdEvent const & a, FdEvent const & b) const
+        { return a.fd_ < b.fd_; }
     };
 
     struct FindFd {
-       bool operator()(FdEvent const & a, int b) const
-       { return a.fd_ < b; }
-       bool operator()(int a, FdEvent const & b) const
-       { return a < b.fd_; }
+        bool operator()(FdEvent const & a, int b) const
+        { return a.fd_ < b; }
+        bool operator()(int a, FdEvent const & b) const
+        { return a < b.fd_; }
     };
     
     class FdDispatcher
-       : public senf::singleton<FdDispatcher>
+        : public senf::singleton<FdDispatcher>
     {
     public:
-       using senf::singleton<FdDispatcher>::instance;
-       using senf::singleton<FdDispatcher>::alive;
-       
+        using senf::singleton<FdDispatcher>::instance;
+        using senf::singleton<FdDispatcher>::alive;
+        
         bool add(FdEvent & event);
         void remove(FdEvent & event);
 
@@ -68,9 +68,9 @@ namespace detail {
         FdDispatcher();
         ~FdDispatcher();
 
-       typedef boost::intrusive::imultiset< FdSetBase::value_traits<FdEvent>,
-                                            FdSetCompare,
-                                            false > FdSet;
+        typedef boost::intrusive::imultiset< FdSetBase::value_traits<FdEvent>,
+                                             FdSetCompare,
+                                             false > FdSet;
 
         FdSet fds_;
 
@@ -80,11 +80,11 @@ namespace detail {
     };
 
     class FileDispatcher
-       : public senf::singleton<FileDispatcher>
+        : public senf::singleton<FileDispatcher>
     {
     public:
-       using senf::singleton<FileDispatcher>::instance;
-       using senf::singleton<FileDispatcher>::alive;
+        using senf::singleton<FileDispatcher>::instance;
+        using senf::singleton<FileDispatcher>::alive;
 
         void add(FdEvent & event);
         void remove(FdEvent & event);
@@ -104,9 +104,9 @@ namespace detail {
 
         // We really only need a list here but we need to use the same event structure used by
         // the FdEvent.
-       typedef boost::intrusive::imultiset< FdSetBase::value_traits<FdEvent>,
-                                            FdSetCompare,
-                                            false > FdSet;
+        typedef boost::intrusive::imultiset< FdSetBase::value_traits<FdEvent>,
+                                             FdSetCompare,
+                                             false > FdSet;
 
         FdSet fds_;
         int managerTimeout_;
index f432032..bf54420 100644 (file)
@@ -23,8 +23,8 @@
 /** \file
     \brief FdManager public header */
 
-#ifndef HH_FdManager_
-#define HH_FdManager_ 1
+#ifndef HH_SENF_Scheduler_FdManager_
+#define HH_SENF_Scheduler_FdManager_ 1
 
 // Custom includes
 #include "Poller.hh"
index 68f96fe..bc29953 100644 (file)
@@ -23,8 +23,8 @@
 /** \file
     \brief Poller public header */
 
-#ifndef HH_Poller_
-#define HH_Poller_ 1
+#ifndef HH_SENF_Scheduler_Poller_
+#define HH_SENF_Scheduler_Poller_ 1
 
 // Custom includes
 #include <sys/epoll.h>
index 85965e5..011b51a 100644 (file)
@@ -21,8 +21,8 @@
 /** \file
     \brief ReadHelper public header */
 
-#ifndef HH_ReadHelper_
-#define HH_ReadHelper_ 1
+#ifndef HH_SENF_Scheduler_ReadHelper_
+#define HH_SENF_Scheduler_ReadHelper_ 1
 
 // Custom includes
 #include <string>
index 619574b..19ffa17 100644 (file)
@@ -21,8 +21,8 @@
 /** \file
     \brief ReadHelper internal header */
 
-#ifndef IH_ReadHelper_
-#define IH_ReadHelper_ 1
+#ifndef IH_SENF_Scheduler_ReadHelper_
+#define IH_SENF_Scheduler_ReadHelper_ 1
 
 // Custom includes
 
index c6b0db8..a8cfe59 100644 (file)
@@ -24,8 +24,8 @@
     \brief Scheduler public header
  */
 
-#ifndef HH_Scheduler_
-#define HH_Scheduler_ 1
+#ifndef HH_SENF_Scheduler_Scheduler_
+#define HH_SENF_Scheduler_Scheduler_ 1
 
 // Custom includes
 #include "../Utils/Logger/SenfLog.hh"
index a5330f2..cc4e989 100644 (file)
@@ -23,8 +23,8 @@
 /** \file
     \brief SignalDispatcher public header */
 
-#ifndef HH_SignalDispatcher_
-#define HH_SignalDispatcher_ 1
+#ifndef HH_SENF_Scheduler_SignalEvent_
+#define HH_SENF_Scheduler_SignalEvent_ 1
 
 // Custom includes
 #include <signal.h>
index 96f01cf..23ef3e7 100644 (file)
@@ -23,8 +23,8 @@
 /** \file
     \brief SignalDispatcher internal header */
 
-#ifndef IH_SignalDispatcher_
-#define IH_SignalDispatcher_ 1
+#ifndef IH_SENF_Scheduler_SignalEvent_
+#define IH_SENF_Scheduler_SignalEvent_ 1
 
 // Custom includes
 #include "FdManager.hh"
index acf7f98..cb5e17f 100644 (file)
@@ -23,8 +23,8 @@
 /** \file
     \brief TimerDispatcher public header */
 
-#ifndef HH_TimerDispatcher_
-#define HH_TimerDispatcher_ 1
+#ifndef HH_SENF_Scheduler_TimerEvent_
+#define HH_SENF_Scheduler_TimerEvent_ 1
 
 // Custom includes
 #include <signal.h>
index 5cda3c0..1c5ea52 100644 (file)
@@ -23,8 +23,8 @@
 /** \file
     \brief TimerDispatcher internal header */
 
-#ifndef IH_TimerDispatcher_
-#define IH_TimerDispatcher_ 1
+#ifndef IH_SENF_Scheduler_TimerEvent_
+#define IH_SENF_Scheduler_TimerEvent_ 1
 
 // Custom includes
 #include "../boost/intrusive/iset.hpp"
index 2280975..3b042a7 100644 (file)
@@ -21,8 +21,8 @@
 /** \file
     \brief WriteHelper public header */
 
-#ifndef HH_WriteHelper_
-#define HH_WriteHelper_ 1
+#ifndef HH_SENF_Scheduler_WriteHelper_
+#define HH_SENF_Scheduler_WriteHelper_ 1
 
 // Custom includes
 #include <string>
index 6e32808..bf0ab3a 100644 (file)
@@ -24,8 +24,8 @@
     \brief NoAddressingPolicy public header
  */
 
-#ifndef HH_AddressingPolicy_
-#define HH_AddressingPolicy_ 1
+#ifndef HH_SENF_Socket_AddressingPolicy_
+#define HH_SENF_Socket_AddressingPolicy_ 1
 
 // Custom includes
 #include "SocketPolicy.hh"
index 7495a69..92635f9 100644 (file)
@@ -24,8 +24,8 @@
     \brief ClientSocketHandle public header
  */
 
-#ifndef HH_ClientSocketHandle_
-#define HH_ClientSocketHandle_ 1
+#ifndef HH_SENF_Socket_ClientSocketHandle_
+#define HH_SENF_Socket_ClientSocketHandle_ 1
 
 // Custom includes
 #include <boost/call_traits.hpp>
index 2251a94..f752e7b 100644 (file)
@@ -23,8 +23,8 @@
 /** \file
     \brief ClientSocketHandle internal header */
 
-#ifndef IH_ClientSocketHandle_
-#define IH_ClientSocketHandle_ 1
+#ifndef IH_SENF_Socket_ClientSocketHandle_
+#define IH_SENF_Socket_ClientSocketHandle_ 1
 
 // Custom includes
 #include "../Utils/IteratorTraits.hh"
index c589b35..47dc01f 100644 (file)
@@ -24,8 +24,8 @@
     \brief CommunicationPolicy public header
  */
 
-#ifndef HH_CommunicationPolicy_
-#define HH_CommunicationPolicy_ 1
+#ifndef HH_SENF_Socket_CommunicationPolicy_
+#define HH_SENF_Socket_CommunicationPolicy_ 1
 
 // Custom includes
 #include "SocketPolicy.hh"
index bbbeab1..7dbe5ba 100644 (file)
@@ -62,8 +62,8 @@
     the SocketHandle classes should not be changed.
  */
 
-#ifndef HH_FileHandle_
-#define HH_FileHandle_ 1
+#ifndef HH_SENF_Socket_FileHandle_
+#define HH_SENF_Socket_FileHandle_ 1
 
 // Custom includes
 #include <memory> // std::auto_ptr
index 84df70c..b1940c6 100644 (file)
@@ -24,8 +24,8 @@
     \brief FileHandle internal header
  */
 
-#ifndef IH_FileHandle_
-#define IH_FileHandle_ 1
+#ifndef IH_SENF_Socket_FileHandle_
+#define IH_SENF_Socket_FileHandle_ 1
 
 // Custom includes
 #include <boost/intrusive_ptr.hpp>
index f7feec3..5359c27 100644 (file)
@@ -24,8 +24,8 @@
     \brief FramingPolicy public header
  */
 
-#ifndef HH_FramingPolicy_
-#define HH_FramingPolicy_ 1
+#ifndef HH_SENF_Socket_FramingPolicy_
+#define HH_SENF_Socket_FramingPolicy_ 1
 
 // Custom includes
 #include "SocketPolicy.hh"
index cabf6a4..56afdac 100644 (file)
@@ -24,8 +24,8 @@
     \brief NetdeviceController public header
  */
 
-#ifndef HH_NetdeviceController_
-#define HH_NetdeviceController_ 1
+#ifndef HH_SENF_Socket_NetdeviceController_
+#define HH_SENF_Socket_NetdeviceController_ 1
 
 // Custom includes
 #include <string>
index ce8518e..835733e 100644 (file)
@@ -24,8 +24,8 @@
     \brief ProtocolClientSocketHandle public header
  */
 
-#ifndef HH_ProtocolClientSocketHandle_
-#define HH_ProtocolClientSocketHandle_ 1
+#ifndef HH_SENF_Socket_ProtocolClientSocketHandle_
+#define HH_SENF_Socket_ProtocolClientSocketHandle_ 1
 
 // Custom includes
 #include "ClientSocketHandle.hh"
index bbd97e6..a39c760 100644 (file)
@@ -24,8 +24,8 @@
     \brief ProtocolServerSocketHandle public header
  */
 
-#ifndef HH_ProtocolServerSocketHandle_
-#define HH_ProtocolServerSocketHandle_ 1
+#ifndef HH_SENF_Socket_ProtocolServerSocketHandle_
+#define HH_SENF_Socket_ProtocolServerSocketHandle_ 1
 
 // Custom includes
 #include "ServerSocketHandle.hh"
index 03d83bb..c17e5eb 100644 (file)
@@ -25,7 +25,7 @@
  */
 
 #if !BOOST_PP_IS_ITERATING
-#ifndef MPP_PSSH__ProtocolServerSocketHandle_
+#ifndef MPP_SENF_Socket_ProtocolServerSocketHandle_
 
 // Custom includes
 #include <boost/preprocessor/iteration/iterate.hpp>
@@ -75,7 +75,7 @@ ProtocolServerSocketHandle( mpp_PSSH_MethodParameters() )
 #endif
 #endif
 #if !BOOST_PP_IS_ITERATING
-#ifdef MPP_PSSH__ProtocolServerSocketHandle_
+#ifdef MPP_SENF_Socket_ProtocolServerSocketHandle_
 ///////////////////////////////////////////////////////////////////////////
 // Undefine local Macros
 
@@ -86,7 +86,7 @@ ProtocolServerSocketHandle( mpp_PSSH_MethodParameters() )
 
 //////////////////////////////mpp_PSSH_.e////////////////////////////////////////
 #else
-#define MPP_PSSH__ProtocolServerSocketHandle_ 1
+#define MPP_SENF_Socket_ProtocolServerSocketHandle_ 1
 #endif
 #endif
 
index 19c916f..ea020de 100644 (file)
@@ -23,8 +23,8 @@
 /** \file
     \brief AddressExceptions public header */
 
-#ifndef HH_AddressExceptions_
-#define HH_AddressExceptions_ 1
+#ifndef HH_SENF_Socket_Protocols_AddressExceptions_
+#define HH_SENF_Socket_Protocols_AddressExceptions_ 1
 
 // Custom includes
 #include "../Utils/Exception.hh"
index 079a940..8ec831c 100644 (file)
@@ -27,8 +27,8 @@
 /** \defgroup addr_group Addressing classes
  */
 
-#ifndef HH_BSDAddressingPolicyMixin_
-#define HH_BSDAddressingPolicyMixin_ 1
+#ifndef HH_SENF_Socket_Protocols_BSDAddressingPolicy_
+#define HH_SENF_Socket_Protocols_BSDAddressingPolicy_ 1
 
 // Custom includes
 #include "../SocketHandle.hh"
index 1e7d1e7..5afd329 100644 (file)
@@ -23,8 +23,8 @@
 /** \file
     \brief BSDSocketAddress public header */
 
-#ifndef HH_BSDSocketAddress_
-#define HH_BSDSocketAddress_ 1
+#ifndef HH_SENF_Socket_Protocols_BSDSocketAddress_
+#define HH_SENF_Socket_Protocols_BSDSocketAddress_ 1
 
 // Custom includes
 #include "../../Utils/safe_bool.hh"
index fbffeba..715837f 100644 (file)
@@ -23,8 +23,8 @@
 /** \file
     \brief BSDSocketProtocol public header */
 
-#ifndef HH_BSDSocketProtocol_
-#define HH_BSDSocketProtocol_ 1
+#ifndef HH_SENF_Socket_Protocols_BSDSocketProtocol_
+#define HH_SENF_Socket_Protocols_BSDSocketProtocol_ 1
 
 // Custom includes
 #include "../../Socket/SocketProtocol.hh"
index 873c415..b60d026 100644 (file)
@@ -23,8 +23,8 @@
 /** \file
     \brief INet public header */
 
-#ifndef HH_DVB_
-#define HH_DVB_ 1
+#ifndef HH_SENF_Socket_Protocols_DVB_DVB_
+#define HH_SENF_Socket_Protocols_DVB_DVB_ 1
 
 #include "all_includes.hh"
 
index aae5d80..d146830 100644 (file)
@@ -23,8 +23,8 @@
 /** \file
     \brief DVBDemuxHandles public header */
 
-#ifndef HH_DVBDemuxHandles_
-#define HH_DVBDemuxHandles_ 1
+#ifndef HH_SENF_Socket_Protocols_DVB_DVBDemuxHandles_
+#define HH_SENF_Socket_Protocols_DVB_DVBDemuxHandles_ 1
 
 // Custom includes
 #include "../../../Socket/FramingPolicy.hh"
index 7545022..632b528 100644 (file)
@@ -23,8 +23,8 @@
 /** \file
     \brief DVBDemuxSocketProtocol public header */
 
-#ifndef HH_DVBDemuxSocketProtocol_
-#define HH_DVBDemuxSocketProtocol_ 1
+#ifndef HH_SENF_Socket_Protocols_DVB_DVBDemuxSocketProtocol_
+#define HH_SENF_Socket_Protocols_DVB_DVBDemuxSocketProtocol_ 1
 
 #include <linux/dvb/dmx.h> 
 
index d13489e..a393eb2 100644 (file)
@@ -67,7 +67,7 @@ prefix_ bool senf::DVBFrontendSocketProtocol::eof()
 prefix_ int16_t senf::DVBFrontendSocketProtocol::signalStrength()
     const
 {
-       int16_t strength;
+        int16_t strength;
     if (::ioctl(fd(), FE_READ_SIGNAL_STRENGTH, &strength) < 0)
         SENF_THROW_SYSTEM_EXCEPTION("Could not get signal strength of DVB adapter.");
     return strength;
index da71b18..04cc21a 100644 (file)
@@ -23,8 +23,8 @@
 /** \file
     \brief DVBFrontendHandle public header */
 
-#ifndef HH_DVBFrontendHandle_
-#define HH_DVBFrontendHandle_ 1
+#ifndef HH_SENF_Socket_Protocols_DVB_DVBFrontendHandle_
+#define HH_SENF_Socket_Protocols_DVB_DVBFrontendHandle_ 1
 
 // Custom includes
 #include <boost/cstdint.hpp>
index 236d8ca..dcf5af8 100644 (file)
@@ -23,8 +23,8 @@
 /** \file
     \brief DatagramSocketProtocol public header */
 
-#ifndef HH_DatagramSocketProtocol_
-#define HH_DatagramSocketProtocol_ 1
+#ifndef HH_SENF_Socket_Protocols_DatagramSocketProtocol_
+#define HH_SENF_Socket_Protocols_DatagramSocketProtocol_ 1
 
 // Custom includes
 #include <sys/time.h>
index 00c2efe..0f63559 100644 (file)
@@ -20,8 +20,8 @@
 // Free Software Foundation, Inc.,
 // 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-#ifndef CONNECTEDRAWINETSOCKETHANDLE_HH_
-#define CONNECTEDRAWINETSOCKETHANDLE_HH_
+#ifndef CONNECTEDHH_SENF_Socket_Protocols_INet_RawINetSocketHandle_
+#define CONNECTEDHH_SENF_Socket_Protocols_INet_RawINetSocketHandle_
 
 // Custom includes
 #include "INetSocketProtocol.hh"
@@ -181,4 +181,4 @@ namespace senf {
 
 }
 
-#endif /*CONNECTEDRAWINETSOCKETHANDLE_HH_*/
+#endif /*CONNECTEDHH_SENF_Socket_Protocols_INet_RawINetSocketHandle_*/
index cfc205c..33ec138 100644 (file)
@@ -27,8 +27,8 @@
     protocol interface
  */
 
-#ifndef HH_ConnectedUDPSocketHandle_
-#define HH_ConnectedUDPSocketHandle_ 1
+#ifndef HH_SENF_Socket_Protocols_INet_ConnectedUDPSocketHandle_
+#define HH_SENF_Socket_Protocols_INet_ConnectedUDPSocketHandle_ 1
 
 // Custom includes
 #include "INetSocketProtocol.hh"
index 18e06be..eb03316 100644 (file)
@@ -23,8 +23,8 @@
 /** \file
     \brief INet public header */
 
-#ifndef HH_INet_
-#define HH_INet_ 1
+#ifndef HH_SENF_Socket_Protocols_INet_INet_
+#define HH_SENF_Socket_Protocols_INet_INet_ 1
 
 #include "all_includes.hh"
 
index 0a75b45..bfea563 100644 (file)
@@ -23,8 +23,8 @@
 /** \file
     \brief INet4Address public header */
 
-#ifndef HH_INet4Address_
-#define HH_INet4Address_ 1
+#ifndef HH_SENF_Socket_Protocols_INet_INet4Address_
+#define HH_SENF_Socket_Protocols_INet_INet4Address_ 1
 
 // Custom includes
 #include <iostream>
index aa29b29..94e240d 100644 (file)
@@ -23,8 +23,8 @@
 /** \file
     \brief INet6Address public header */
 
-#ifndef HH_INet6Address_
-#define HH_INet6Address_ 1
+#ifndef HH_SENF_Socket_Protocols_INet_INet6Address_
+#define HH_SENF_Socket_Protocols_INet_INet6Address_ 1
 
 // Custom includes
 #include <iostream>
index 2f4cbe2..b1908b4 100644 (file)
@@ -23,8 +23,8 @@
 /** \file
     \brief INet6Address internal header */
 
-#ifndef IH_INet6Address_
-#define IH_INet6Address_ 1
+#ifndef IH_SENF_Socket_Protocols_INet_INet6Address_
+#define IH_SENF_Socket_Protocols_INet_INet6Address_ 1
 
 // Custom includes
 
index aeb76bd..f9327b5 100644 (file)
@@ -24,8 +24,8 @@
     \brief INet[46]Address and INet[46]AddressingPolicy public header
  */
 
-#ifndef HH_INetAddressing_
-#define HH_INetAddressing_ 1
+#ifndef HH_SENF_Socket_Protocols_INet_INetAddressing_
+#define HH_SENF_Socket_Protocols_INet_INetAddressing_ 1
 
 // Custom includes
 #include <string>
index b69f5fe..0d90ef0 100644 (file)
@@ -30,8 +30,8 @@
     for SOCK_DGRAM (UDP) and not SOCK_STREAM (TCP) sockets
  */
 
-#ifndef HH_INetSocketProtocol_
-#define HH_INetSocketProtocol_ 1
+#ifndef HH_SENF_Socket_Protocols_INet_INetSocketProtocol_
+#define HH_SENF_Socket_Protocols_INet_INetSocketProtocol_ 1
 
 // Custom includes
 #include "../../../Socket/SocketProtocol.hh"
index 3dc6838..173f4fd 100644 (file)
@@ -23,8 +23,8 @@
 /** \file
     \brief MulticastSocketProtocol public header */
 
-#ifndef HH_MulticastSocketProtocol_
-#define HH_MulticastSocketProtocol_ 1
+#ifndef HH_SENF_Socket_Protocols_INet_MulticastSocketProtocol_
+#define HH_SENF_Socket_Protocols_INet_MulticastSocketProtocol_ 1
 
 // Custom includes
 #include "../../../Socket/SocketProtocol.hh"
index 4be6a44..e0001fa 100644 (file)
@@ -20,8 +20,8 @@
 // Free Software Foundation, Inc.,
 // 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-#ifndef RAWINETSOCKETHANDLE_HH_
-#define RAWINETSOCKETHANDLE_HH_
+#ifndef HH_SENF_Socket_Protocols_INet_RawINetSocketHandle_
+#define HH_SENF_Socket_Protocols_INet_RawINetSocketHandle_
 
 
 // Custom includes
@@ -181,4 +181,4 @@ namespace senf {
 
 }
 
-#endif /*RAWINETSOCKETHANDLE_HH_*/
+#endif /*HH_SENF_Socket_Protocols_INet_RawINetSocketHandle_*/
index abf866b..c93058a 100644 (file)
@@ -20,8 +20,8 @@
 // Free Software Foundation, Inc.,
 // 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-#ifndef RAWINETPROTOCOL_HH_
-#define RAWINETPROTOCOL_HH_
+#ifndef HH_SENF_Socket_Protocols_INet_RawINetSocketProtocol_
+#define HH_SENF_Socket_Protocols_INet_RawINetSocketProtocol_
 
 // Custom includes
 #include "INetAddressing.hh"
@@ -59,4 +59,4 @@ namespace senf {
     /// @}
 }
 
-#endif /*RAWINETPROTOCOL_HH_*/
+#endif /*HH_SENF_Socket_Protocols_INet_RawINetSocketProtocol_*/
index 15aba83..476afad 100644 (file)
@@ -27,8 +27,8 @@
     protocol interface
  */
 
-#ifndef HH_TCPSocketHandle_
-#define HH_TCPSocketHandle_ 1
+#ifndef HH_SENF_Socket_Protocols_INet_TCPSocketHandle_
+#define HH_SENF_Socket_Protocols_INet_TCPSocketHandle_ 1
 
 // Custom includes
 #include "INetSocketProtocol.hh"
index 232d38a..d11578c 100644 (file)
@@ -24,8 +24,8 @@
     \brief TCPSocketProtocol public header
  */
 
-#ifndef HH_TCPSocketProtocol_
-#define HH_TCPSocketProtocol_ 1
+#ifndef HH_SENF_Socket_Protocols_INet_TCPSocketProtocol_
+#define HH_SENF_Socket_Protocols_INet_TCPSocketProtocol_ 1
 
 // Custom includes
 #include "../../../Socket/SocketProtocol.hh"
index 378511e..1b07145 100644 (file)
@@ -27,8 +27,8 @@
     protocol interface
  */
 
-#ifndef HH_UDPSocketHandle_
-#define HH_UDPSocketHandle_ 1
+#ifndef HH_SENF_Socket_Protocols_INet_UDPSocketHandle_
+#define HH_SENF_Socket_Protocols_INet_UDPSocketHandle_ 1
 
 // Custom includes
 #include "INetSocketProtocol.hh"
index e869e5e..6802730 100644 (file)
@@ -24,8 +24,8 @@
     \brief UDPSocketProtocol public header
  */
 
-#ifndef HH_UDPSocketProtocol_
-#define HH_UDPSocketProtocol_ 1
+#ifndef HH_SENF_Socket_Protocols_INet_UDPSocketProtocol_
+#define HH_SENF_Socket_Protocols_INet_UDPSocketProtocol_ 1
 
 // Custom includes
 #include "../../../Socket/SocketProtocol.hh"
index 7c9591d..78a1c32 100644 (file)
@@ -24,8 +24,8 @@
     \brief LLSocketAddress and LLAddressingPolicy public header
  */
 
-#ifndef HH_LLAddressing_
-#define HH_LLAddressing_ 1
+#ifndef HH_SENF_Socket_Protocols_Raw_LLAddressing_
+#define HH_SENF_Socket_Protocols_Raw_LLAddressing_ 1
 
 // Custom includes
 #include <sys/socket.h>
index c12b0ed..22b0ca9 100644 (file)
@@ -108,9 +108,9 @@ senf::MACAddress const senf::MACAddress::Broadcast = senf::MACAddress(0xFFFFFFFF
 senf::MACAddress const senf::MACAddress::None;
 
 prefix_ std::string senf::MACAddress::toString() const {
-       std::ostringstream tmp; 
-       tmp << (*this);
-       return tmp.str();
+        std::ostringstream tmp; 
+        tmp << (*this);
+        return tmp.str();
 }
 
 ///////////////////////////////////////////////////////////////////////////
index de52a30..4281efd 100644 (file)
@@ -23,8 +23,8 @@
 /** \file
     \brief MACAddress public header */
 
-#ifndef HH_MACAddress_
-#define HH_MACAddress_ 1
+#ifndef HH_SENF_Socket_Protocols_Raw_MACAddress_
+#define HH_SENF_Socket_Protocols_Raw_MACAddress_ 1
 
 // Custom includes
 #include <iostream>
index df256c9..29a3617 100644 (file)
@@ -39,7 +39,7 @@
 
 BOOST_AUTO_UNIT_TEST(macAddress)
 {
-       std::string test ("A1-b2-C3:d4:E5:f6");
+        std::string test ("A1-b2-C3:d4:E5:f6");
     senf::MACAddress mac (senf::MACAddress::from_string(test));
 
     BOOST_CHECK_EQUAL( mac[0], 0xA1u );
index 51f85c8..3cae497 100644 (file)
@@ -24,8 +24,8 @@
     \brief PacketSocketProtocol and PacketSocketHandle public header
  */
 
-#ifndef HH_PacketSocketHandle_
-#define HH_PacketSocketHandle_ 1
+#ifndef HH_SENF_Socket_Protocols_Raw_PacketSocketHandle_
+#define HH_SENF_Socket_Protocols_Raw_PacketSocketHandle_ 1
 
 // Custom includes
 #include "../../../Socket/SocketPolicy.hh"
index 9d5109d..3a0d06f 100644 (file)
@@ -23,8 +23,8 @@
 /** \file
     \brief Raw public header */
 
-#ifndef HH_Raw_
-#define HH_Raw_ 1
+#ifndef HH_SENF_Socket_Protocols_Raw_Raw_
+#define HH_SENF_Socket_Protocols_Raw_Raw_ 1
 
 #include "all_includes.hh"
 
index 751aef0..5c54ece 100644 (file)
@@ -24,8 +24,8 @@
     \brief PacketSocketProtocol and PacketSocketHandle public header
  */
 
-#ifndef HH_TunTapSocketHandle_
-#define HH_TunTapSocketHandle_ 1
+#ifndef HH_SENF_Socket_Protocols_Raw_TunTapSocketHandle_
+#define HH_SENF_Socket_Protocols_Raw_TunTapSocketHandle_ 1
 
 // Custom includes
 #include "../../../Socket/SocketPolicy.hh"
index b259925..68c80e6 100644 (file)
@@ -23,8 +23,8 @@
 /** \file
     \brief ConnectedUNDatagramSocketHandle public header */
 
-#ifndef CONNECTEDUNDATAGRAMSOCKETHANDLE_HH_
-#define CONNECTEDUNDATAGRAMSOCKETHANDLE_HH_
+#ifndef HHE_SENF_Socket_Protocols_UN_ConnectedUNDatagramSocketHandle_
+#define HHE_SENF_Socket_Protocols_UN_ConnectedUNDatagramSocketHandle_
 
 // Custom includes
 #include "UNAddressing.hh"
index 6719500..25c6a9c 100644 (file)
@@ -23,8 +23,8 @@
 /** \file
     \brief INet public header */
 
-#ifndef HH_UN_
-#define HH_UN_ 1
+#ifndef HH_SENF_Socket_Protocols_UN_UN_
+#define HH_SENF_Socket_Protocols_UN_UN_ 1
 
 #include "all_includes.hh"
 
index b08b6e3..eccb8d3 100644 (file)
@@ -23,8 +23,8 @@
 /** \file
     \brief UNAddressing public header */
 
-#ifndef HH_UNAddressing_
-#define HH_UNAddressing_ 1
+#ifndef HH_SENF_Socket_Protocols_UN_UNAddressing_
+#define HH_SENF_Socket_Protocols_UN_UNAddressing_ 1
 
 // Custom includes
 #include <iostream>
index 4f47dd9..b57996d 100644 (file)
@@ -23,8 +23,8 @@
 /** \file
     \brief UNDatagramSocketHandle public header */
 
-#ifndef HH_UNDatagramSocketHandle_
-#define HH_UNDatagramSocketHandle_ 1
+#ifndef HH_SENF_Socket_Protocols_UN_UNDatagramSocketHandle_
+#define HH_SENF_Socket_Protocols_UN_UNDatagramSocketHandle_ 1
 
 // Custom includes
 #include "UNAddressing.hh"
index d7a4699..fc56f1b 100644 (file)
@@ -23,8 +23,8 @@
 /** \file
     \brief UNSocketProtocol public header */
 
-#ifndef HH_UNSocketProtocol_
-#define HH_UNSocketProtocol_ 1
+#ifndef HH_SENF_Socket_Protocols_UN_UNSocketProtocol_
+#define HH_SENF_Socket_Protocols_UN_UNSocketProtocol_ 1
 
 // Custom includes
 #include "../../../Socket/SocketProtocol.hh"
index 4ddff67..023b3f6 100644 (file)
@@ -26,8 +26,8 @@
     \todo ReadWritePolicy.test.cc
  */
 
-#ifndef HH_ReadWritePolicy_
-#define HH_ReadWritePolicy_ 1
+#ifndef HH_SENF_Socket_ReadWritePolicy_
+#define HH_SENF_Socket_ReadWritePolicy_ 1
 
 // Custom includes
 #include "SocketPolicy.hh"
index 819fb71..235b590 100644 (file)
@@ -24,8 +24,8 @@
     \brief ServerSocketHandle public header
  */
 
-#ifndef HH_ServerSocketHandle_
-#define HH_ServerSocketHandle_ 1
+#ifndef HH_SENF_Socket_ServerSocketHandle_
+#define HH_SENF_Socket_ServerSocketHandle_ 1
 
 // Custom includes
 #include <boost/static_assert.hpp>
index 45f88d6..ca54b3c 100644 (file)
@@ -23,8 +23,8 @@
 /** \file
     \brief Socket public header */
 
-#ifndef HH_Socket_
-#define HH_Socket_ 1
+#ifndef HH_SENF_Socket_Socket_
+#define HH_SENF_Socket_Socket_ 1
 
 #include "all_includes.hh"
 
index 867d0aa..9f41494 100644 (file)
@@ -24,8 +24,8 @@
     \brief SocketHandle public header
  */
 
-#ifndef HH_SocketHandle_
-#define HH_SocketHandle_ 1
+#ifndef HH_SENF_Socket_SocketHandle_
+#define HH_SENF_Socket_SocketHandle_ 1
 
 // Custom includes
 #include <memory> // std::auto_ptr
index b113145..bc974b8 100644 (file)
@@ -24,8 +24,8 @@
     \brief SocketHandle internal header
  */
 
-#ifndef IH_SocketHandle_
-#define IH_SocketHandle_ 1
+#ifndef IH_SENF_Socket_SocketHandle_
+#define IH_SENF_Socket_SocketHandle_ 1
 
 // Custom includes
 #include <map>
index 39d358e..7d2c059 100644 (file)
     as base classes to build other policy classes.
  */
 
-#ifndef HH_SocketPolicy_
-#define HH_SocketPolicy_ 1
+#ifndef HH_SENF_Socket_SocketPolicy_
+#define HH_SENF_Socket_SocketPolicy_ 1
 
 // Custom includes
 
index 9819f00..b335280 100644 (file)
@@ -24,8 +24,8 @@
     \brief Policy Framework internal header
  */
 
-#ifndef IH_SocketPolicy_
-#define IH_SocketPolicy_ 1
+#ifndef IH_SENF_Socket_SocketPolicy_
+#define IH_SENF_Socket_SocketPolicy_ 1
 
 // Custom includes
 #include <boost/preprocessor/seq/for_each.hpp>
index 00bf252..8dd46d1 100644 (file)
@@ -20,8 +20,8 @@
 // Free Software Foundation, Inc.,
 // 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-#ifndef HH_SocketPolicy_test_
-#define HH_SocketPolicy_test_ 1
+#ifndef HH_SENF_Socket_SocketPolicy_test_
+#define HH_SENF_Socket_SocketPolicy_test_ 1
 
 // Custom includes
 #include "SocketPolicy.hh"
index 012b857..7590312 100644 (file)
@@ -89,8 +89,8 @@
     accessibility of the socket body from all facets.
  */
 
-#ifndef HH_SocketProtocol_
-#define HH_SocketProtocol_ 1
+#ifndef HH_SENF_Socket_SocketProtocol_
+#define HH_SENF_Socket_SocketProtocol_ 1
 
 // Custom includes
 #include <boost/utility.hpp>
index bdfb5f7..497cff1 100644 (file)
@@ -20,8 +20,8 @@
 // Free Software Foundation, Inc.,
 // 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-#ifndef HH_SocketProtocol_test_
-#define HH_SocketProtocol_test_ 1
+#ifndef HH_SENF_Socket_SocketProtocol_test_
+#define HH_SENF_Socket_SocketProtocol_test_ 1
 
 // Custom includes
 #include "SocketProtocol.hh"
index 03f4741..f7f8925 100644 (file)
@@ -23,8 +23,8 @@
 /** \file
     \brief Backtrace public header */
 
-#ifndef HH_Backtrace_
-#define HH_Backtrace_ 1
+#ifndef HH_SENF_Utils_Backtrace_
+#define HH_SENF_Utils_Backtrace_ 1
 
 // Custom includes
 #include <iostream>
index c5e92bf..4510010 100644 (file)
@@ -23,8 +23,8 @@
 /** \file
     \brief Buffer public header */
 
-#ifndef HH_Buffer_
-#define HH_Buffer_ 1
+#ifndef HH_SENF_Utils_Buffer_
+#define HH_SENF_Utils_Buffer_ 1
 
 // Custom includes
 #include "../config.hh"
index f0c45c0..8747182 100644 (file)
@@ -23,8 +23,8 @@
 /** \file
     \brief Daemon public header */
 
-#ifndef HH_Daemon_
-#define HH_Daemon_ 1
+#ifndef HH_SENF_Utils_Daemon_Daemon_
+#define HH_SENF_Utils_Daemon_Daemon_ 1
 
 // Custom includes
 #include <boost/utility.hpp>
index f6ec463..bd29a9b 100644 (file)
@@ -23,8 +23,8 @@
 /** \file
     \brief Daemon internal header */
 
-#ifndef IH_Daemon_
-#define IH_Daemon_ 1
+#ifndef IH_SENF_Utils_Daemon_Daemon_
+#define IH_SENF_Utils_Daemon_Daemon_ 1
 
 // Custom includes
 #include <deque>
index b151b88..42e1326 100644 (file)
@@ -23,8 +23,8 @@
 /** \file
     \brief Exception public header */
 
-#ifndef HH_Exception_
-#define HH_Exception_ 1
+#ifndef HH_SENF_Utils_Exception_
+#define HH_SENF_Utils_Exception_ 1
 
 // Custom includes
 #include <exception>
index fa0fcf1..a8ea1ff 100644 (file)
@@ -23,8 +23,8 @@
 /** \file
     \brief IpChecksum public header */
 
-#ifndef HH_IpChecksum_
-#define HH_IpChecksum_ 1
+#ifndef HH_SENF_Utils_IpChecksum_
+#define HH_SENF_Utils_IpChecksum_ 1
 
 // Custom includes
 #include <boost/cstdint.hpp>
index 3d9d623..bb2fa5a 100644 (file)
@@ -23,8 +23,8 @@
 /** \file
     \brief IteratorTraits public header */
 
-#ifndef HH_IteratorTraits_
-#define HH_IteratorTraits_ 1
+#ifndef HH_SENF_Utils_IteratorTraits_
+#define HH_SENF_Utils_IteratorTraits_ 1
 
 // Custom includes
 #include <boost/type_traits/integral_constant.hpp>
index 5ed4533..20e2476 100644 (file)
@@ -23,8 +23,8 @@
 /** \file
     \brief IteratorTraits internal header */
 
-#ifndef IH_IteratorTraits_
-#define IH_IteratorTraits_ 1
+#ifndef IH_SENF_Utils_IteratorTraits_
+#define IH_SENF_Utils_IteratorTraits_ 1
 
 // Custom includes
 
index 1ab88e6..386bb2c 100644 (file)
@@ -23,8 +23,8 @@
 /** \file
     \brief AreaRegistry public header */
 
-#ifndef HH_AreaRegistry_
-#define HH_AreaRegistry_ 1
+#ifndef HH_SENF_Utils_Logger_AreaRegistry_
+#define HH_SENF_Utils_Logger_AreaRegistry_ 1
 
 // Custom includes
 #include <map>
index 709b51c..58709bf 100644 (file)
@@ -23,8 +23,8 @@
 /** \file
     \brief AreaRegistry internal header */
 
-#ifndef IH_AreaRegistry_
-#define IH_AreaRegistry_ 1
+#ifndef IH_SENF_Utils_Logger_AreaRegistry_
+#define IH_SENF_Utils_Logger_AreaRegistry_ 1
 
 // Custom includes
 #include <string>
index cd6ccc6..9f0f735 100644 (file)
@@ -23,8 +23,8 @@
 /** \file
     \brief Config public header */
 
-#ifndef HH_Config_
-#define HH_Config_ 1
+#ifndef HH_SENF_Utils_Logger_Config_
+#define HH_SENF_Utils_Logger_Config_ 1
 
 // Custom includes
 #include "Levels.hh"
index 004368d..a850fde 100644 (file)
@@ -23,8 +23,8 @@
 /** \file
     \brief Config internal header */
 
-#ifndef IH_Config_
-#define IH_Config_ 1
+#ifndef IH_SENF_Utils_Logger_Config_
+#define IH_SENF_Utils_Logger_Config_ 1
 
 // Custom includes
 #include <boost/preprocessor/expand.hpp>
index 4b7da17..b83b4dd 100644 (file)
@@ -23,8 +23,8 @@
 /** \file
     \brief ConsoleTarget public header */
 
-#ifndef HH_ConsoleTarget_
-#define HH_ConsoleTarget_ 1
+#ifndef HH_SENF_Utils_Logger_ConsoleTarget_
+#define HH_SENF_Utils_Logger_ConsoleTarget_ 1
 
 // Custom includes
 #include "IOStreamTarget.hh"
index db8013f..314937b 100644 (file)
@@ -23,8 +23,8 @@
 /** \file
     \brief Definitions public header */
 
-#ifndef HH_Definitions_
-#define HH_Definitions_ 1
+#ifndef HH_SENF_Utils_Logger_Definitions_
+#define HH_SENF_Utils_Logger_Definitions_ 1
 
 // Custom includes
 
index a40ec3f..b222293 100644 (file)
@@ -23,8 +23,8 @@
 /** \file
     \brief Definitions internal header */
 
-#ifndef IH_Definitions_
-#define IH_Definitions_ 1
+#ifndef IH_SENF_Utils_Logger_Definitions_
+#define IH_SENF_Utils_Logger_Definitions_ 1
 
 // Custom includes
 
index 45f11fd..5c4cc34 100644 (file)
@@ -23,8 +23,8 @@
 /** \file
     \brief FileTarget public header */
 
-#ifndef HH_FileTarget_
-#define HH_FileTarget_ 1
+#ifndef HH_SENF_Utils_Logger_FileTarget_
+#define HH_SENF_Utils_Logger_FileTarget_ 1
 
 // Custom includes
 #include <boost/utility.hpp>
index 05f9eee..18003c0 100644 (file)
@@ -23,8 +23,8 @@
 /** \file
     \brief IOStreamTarget public header */
 
-#ifndef HH_IOStreamTarget_
-#define HH_IOStreamTarget_ 1
+#ifndef HH_SENF_Utils_Logger_IOStreamTarget_
+#define HH_SENF_Utils_Logger_IOStreamTarget_ 1
 
 // Custom includes
 #include <boost/utility.hpp>
index f537fce..e53af86 100644 (file)
@@ -23,8 +23,8 @@
 /** \file
     \brief Levels public header */
 
-#ifndef HH_Levels_
-#define HH_Levels_ 1
+#ifndef HH_SENF_Utils_Logger_Levels_
+#define HH_SENF_Utils_Logger_Levels_ 1
 
 // Custom includes
 
index 1557db7..92989eb 100644 (file)
@@ -23,8 +23,8 @@
 /** \file
     \brief Levels internal header */
 
-#ifndef IH_Levels_
-#define IH_Levels_ 1
+#ifndef IH_SENF_Utils_Logger_Levels_
+#define IH_SENF_Utils_Logger_Levels_ 1
 
 // Custom includes
 
index 4faf2f9..8a0794c 100644 (file)
@@ -23,8 +23,8 @@
 /** \file
     \brief Log public header */
 
-#ifndef HH_Log_
-#define HH_Log_ 1
+#ifndef HH_SENF_Utils_Logger_Log_
+#define HH_SENF_Utils_Logger_Log_ 1
 
 // Custom includes
 #include <boost/preprocessor/seq/size.hpp>
index 4abdad9..0d3f030 100644 (file)
@@ -23,8 +23,8 @@
 /** \file
     \brief Log internal header */
 
-#ifndef IH_Log_
-#define IH_Log_ 1
+#ifndef IH_SENF_Utils_Logger_Log_
+#define IH_SENF_Utils_Logger_Log_ 1
 
 // Custom includes
 #include <sstream>
index 123b2ee..93fdbba 100644 (file)
@@ -23,8 +23,8 @@
 /** \file
     \brief Logger public header */
 
-#ifndef HH_Logger_
-#define HH_Logger_ 1
+#ifndef HH_SENF_Utils_Logger_Logger_
+#define HH_SENF_Utils_Logger_Logger_ 1
 
 #include "all_includes.hh"
 
index 6d8fbed..7ecada1 100644 (file)
@@ -23,8 +23,8 @@
 /** \file
     \brief Parameters public header */
 
-#ifndef HH_Parameters_
-#define HH_Parameters_ 1
+#ifndef HH_SENF_Utils_Logger_Parameters_
+#define HH_SENF_Utils_Logger_Parameters_ 1
 
 // Custom includes
 
index 7e21072..4941b79 100644 (file)
@@ -23,8 +23,8 @@
 /** \file
     \brief Parameters internal header */
 
-#ifndef IH_Parameters_
-#define IH_Parameters_ 1
+#ifndef IH_SENF_Utils_Logger_Parameters_
+#define IH_SENF_Utils_Logger_Parameters_ 1
 
 // Custom includes
 #include <iostream>
index 8a6c9c1..82b9464 100644 (file)
@@ -23,8 +23,8 @@
 /** \file
     \brief SenfLog public header */
 
-#ifndef HH_SenfLog_
-#define HH_SenfLog_ 1
+#ifndef HH_SENF_Utils_Logger_SenfLog_
+#define HH_SENF_Utils_Logger_SenfLog_ 1
 
 // Custom includes
 #include "../../config.hh"
index 63ba124..c35b69d 100644 (file)
@@ -23,8 +23,8 @@
 /** \file
     \brief StreamRegistry public header */
 
-#ifndef HH_StreamRegistry_
-#define HH_StreamRegistry_ 1
+#ifndef HH_SENF_Utils_Logger_StreamRegistry_
+#define HH_SENF_Utils_Logger_StreamRegistry_ 1
 
 // Custom includes
 #include <map>
index f6a4138..4216553 100644 (file)
@@ -23,8 +23,8 @@
 /** \file
     \brief StreamRegistry internal header */
 
-#ifndef IH_StreamRegistry_
-#define IH_StreamRegistry_ 1
+#ifndef IH_SENF_Utils_Logger_StreamRegistry_
+#define IH_SENF_Utils_Logger_StreamRegistry_ 1
 
 // Custom includes
 #include <string>
index ed16520..a8bc5a2 100644 (file)
@@ -23,8 +23,8 @@
 /** \file
     \brief StringTarget public header */
 
-#ifndef HH_StringTarget_
-#define HH_StringTarget_ 1
+#ifndef HH_SENF_Utils_Logger_StringTarget_
+#define HH_SENF_Utils_Logger_StringTarget_ 1
 
 // Custom includes
 #include <sstream>
index 18a1559..786b58c 100644 (file)
@@ -23,8 +23,8 @@
 /** \file
     \brief SyslogTarget public header */
 
-#ifndef HH_SyslogTarget_
-#define HH_SyslogTarget_ 1
+#ifndef HH_SENF_Utils_Logger_SyslogTarget_
+#define HH_SENF_Utils_Logger_SyslogTarget_ 1
 
 // Custom includes
 #include <syslog.h>
index ad7e7b2..2190ed5 100644 (file)
@@ -23,8 +23,8 @@
 /** \file
     \brief Target public header */
 
-#ifndef HH_Target_
-#define HH_Target_ 1
+#ifndef HH_SENF_Utils_Logger_Target_
+#define HH_SENF_Utils_Logger_Target_ 1
 
 // Custom includes
 #include <set>
index 01d0728..c96eb32 100644 (file)
@@ -23,8 +23,8 @@
 /** \file
     \brief Target internal header */
 
-#ifndef IH_Target_
-#define IH_Target_ 1
+#ifndef IH_SENF_Utils_Logger_Target_
+#define IH_SENF_Utils_Logger_Target_ 1
 
 // Custom includes
 #include <memory>
index ed2c490..d6fa204 100644 (file)
@@ -23,8 +23,8 @@
 /** \file
     \brief TimeSource public header */
 
-#ifndef HH_TimeSource_
-#define HH_TimeSource_ 1
+#ifndef HH_SENF_Utils_Logger_TimeSource_
+#define HH_SENF_Utils_Logger_TimeSource_ 1
 
 // Custom includes
 #include <boost/cstdint.hpp>
index c0ab54f..9d02972 100644 (file)
@@ -23,8 +23,8 @@
 /** \file
     \brief TimeSource internal header */
 
-#ifndef IH_TimeSource_
-#define IH_TimeSource_ 1
+#ifndef IH_SENF_Utils_Logger_TimeSource_
+#define IH_SENF_Utils_Logger_TimeSource_ 1
 
 // Custom includes
 #include <boost/scoped_ptr.hpp>
index 1d20923..aafc4df 100644 (file)
@@ -23,8 +23,8 @@
 /** \file
     \brief main.test public header */
 
-#ifndef HH_main_test_
-#define HH_main_test_ 1
+#ifndef HH_SENF_Utils_Logger_main_test_
+#define HH_SENF_Utils_Logger_main_test_ 1
 
 // Custom includes
 
index 5e04362..773bc5a 100644 (file)
@@ -23,8 +23,8 @@
 /** \file
     \brief Phoenix public header */
 
-#ifndef HH_Phoenix_
-#define HH_Phoenix_ 1
+#ifndef HH_SENF_Utils_Phoenix_
+#define HH_SENF_Utils_Phoenix_ 1
 
 // Custom includes
 #include <boost/spirit/phoenix/functions.hpp>
index 485bbc4..fb548e5 100644 (file)
@@ -23,8 +23,8 @@
 /** \file
     \brief Phoenix internal header */
 
-#ifndef IH_Phoenix_
-#define IH_Phoenix_ 1
+#ifndef IH_SENF_Utils_Phoenix_
+#define IH_SENF_Utils_Phoenix_ 1
 
 // Custom includes
 
index db6d63e..f9da322 100644 (file)
@@ -23,8 +23,8 @@
 /** \file
     \brief Range public header */
 
-#ifndef HH_Range_
-#define HH_Range_ 1
+#ifndef HH_SENF_Utils_Range_
+#define HH_SENF_Utils_Range_ 1
 
 // Custom includes
 #include <boost/range/iterator_range.hpp>
index 1bdf93e..10f523e 100644 (file)
@@ -23,8 +23,8 @@
 /** \file
     \brief String public header */
 
-#ifndef HH_String_
-#define HH_String_ 1
+#ifndef HH_SENF_Utils_String_
+#define HH_SENF_Utils_String_ 1
 
 // Custom includes
 #include <string>
index 9328c0d..ff9f374 100644 (file)
@@ -23,8 +23,8 @@
 /** \file
     \brief Tags public header */
 
-#ifndef HH_Tags_
-#define HH_Tags_ 1
+#ifndef HH_SENF_Utils_Tags_
+#define HH_SENF_Utils_Tags_ 1
 
 // Custom includes
 
index 0e8d337..85eebf0 100644 (file)
@@ -23,8 +23,8 @@
 /** \file
     \brief TypeIdValue public header */
 
-#ifndef HH_TypeIdValue_
-#define HH_TypeIdValue_ 1
+#ifndef HH_SENF_Utils_TypeIdValue_
+#define HH_SENF_Utils_TypeIdValue_ 1
 
 // Custom includes
 #include <typeinfo>
index ef4b720..e5e6998 100644 (file)
@@ -23,8 +23,8 @@
 /** \file
     \brief TypeInfo public header */
 
-#ifndef HH_TypeInfo_
-#define HH_TypeInfo_ 1
+#ifndef HH_SENF_Utils_TypeInfo_
+#define HH_SENF_Utils_TypeInfo_ 1
 
 // Custom includes
 #include <string>
index 402dd63..95980e3 100644 (file)
@@ -33,8 +33,8 @@
     </pre> (with possibliy adjusted path).
  */
 
-#ifndef HH_auto_unit_test_
-#define HH_auto_unit_test_ 1
+#ifndef HH_SENF_Utils_auto_unit_test_
+#define HH_SENF_Utils_auto_unit_test_ 1
 
 // Custom includes
 #include <boost/version.hpp>
index 4cd5062..f5a60e6 100644 (file)
@@ -23,8 +23,8 @@
 /** \file
     \brief public header for hexdump */
 
-#ifndef HH_hexdump_
-#define HH_hexdump_ 1
+#ifndef HH_SENF_Utils_hexdump_
+#define HH_SENF_Utils_hexdump_ 1
 
 // Custom includes
 #include <iostream>
index 2c530a8..c03f51b 100644 (file)
@@ -23,8 +23,8 @@
 /** \file
     \brief hexdump internal header */
 
-#ifndef IH_hexdump_
-#define IH_hexdump_ 1
+#ifndef IH_SENF_Utils_hexdump_
+#define IH_SENF_Utils_hexdump_ 1
 
 // Custom includes
 #include <string>
index b3bfd56..d3b980f 100644 (file)
@@ -23,8 +23,8 @@
 /** \file
     \brief intrusive_refcount public header */
 
-#ifndef HH_intrusive_refcount_
-#define HH_intrusive_refcount_ 1
+#ifndef HH_SENF_Utils_intrusive_refcount_
+#define HH_SENF_Utils_intrusive_refcount_ 1
 
 // Custom includes
 #include <boost/utility.hpp>
index 6b06ed3..7429307 100644 (file)
@@ -46,8 +46,8 @@
     ob.*fn use.
  */
 
-#ifndef HH_membind_
-#define HH_membind_ 1
+#ifndef HH_SENF_Utils_membind_
+#define HH_SENF_Utils_membind_ 1
 
 // Custom includes
 #include <boost/bind.hpp>
index f33ca7e..fb1b566 100644 (file)
@@ -23,8 +23,8 @@
 /** \file
     \brief mpl public header */
 
-#ifndef HH_mpl_
-#define HH_mpl_ 1
+#ifndef HH_SENF_Utils_mpl_
+#define HH_SENF_Utils_mpl_ 1
 
 // Custom includes
 #include "../config.hh"
index d3de418..060b94b 100644 (file)
@@ -23,8 +23,8 @@
 /** \file
     \brief mpl internal header */
 
-#ifndef IH_mpl_
-#define IH_mpl_ 1
+#ifndef IH_SENF_Utils_mpl_
+#define IH_SENF_Utils_mpl_ 1
 
 // Custom includes
 
index 7ea462c..37287fb 100644 (file)
@@ -30,8 +30,8 @@
     library.
  */
 
-#ifndef HH_parameter_
-#define HH_parameter_ 1
+#ifndef HH_SENF_Utils_parameter_
+#define HH_SENF_Utils_parameter_ 1
 
 // Custom includes
 #include <boost/parameter/binding.hpp>
index 5fab5f6..2cdfe5e 100644 (file)
@@ -23,8 +23,8 @@
 /** \file
     \brief pool_alloc_mixin public header */
 
-#ifndef HH_pool_alloc_mixin_
-#define HH_pool_alloc_mixin_ 1
+#ifndef HH_SENF_Utils_pool_alloc_mixin_
+#define HH_SENF_Utils_pool_alloc_mixin_ 1
 
 // Custom includes
 #include <boost/pool/singleton_pool.hpp>
index 0567d78..915f9be 100644 (file)
@@ -23,8 +23,8 @@
 /** \file
     \brief preprocessor public header */
 
-#ifndef HH_preprocessor_
-#define HH_preprocessor_ 1
+#ifndef HH_SENF_Utils_preprocessor_
+#define HH_SENF_Utils_preprocessor_ 1
 
 // Custom includes
 #include <boost/preprocessor/seq/size.hpp>
index 9d4109b..d7accb2 100644 (file)
@@ -23,8 +23,8 @@
 /** \file
     \brief range public header */
 
-#ifndef HH_range_
-#define HH_range_ 1
+#ifndef HH_SENF_Utils_range_
+#define HH_SENF_Utils_range_ 1
 
 // Custom includes
 
index e8cff22..44c1861 100644 (file)
@@ -23,8 +23,8 @@
 /** \file
     \brief safe_bool public header */
 
-#ifndef HH_safe_bool_
-#define HH_safe_bool_ 1
+#ifndef HH_SENF_Utils_safe_bool_
+#define HH_SENF_Utils_safe_bool_ 1
 
 // Custom includes
 
index 245bca9..caa515a 100644 (file)
@@ -23,8 +23,8 @@
 /** \file
     \brief senfassert public header */
 
-#ifndef HH_senfassert_
-#define HH_senfassert_ 1
+#ifndef HH_SENF_Utils_senfassert_
+#define HH_SENF_Utils_senfassert_ 1
 
 // Custom includes
 #include "../Utils/senfassert.hh"
index ecfbe4e..b5b8f34 100644 (file)
@@ -23,8 +23,8 @@
 /** \file
     \brief signalnames public header */
 
-#ifndef HH_signalnames_
-#define HH_signalnames_ 1
+#ifndef HH_SENF_Utils_signalnames_
+#define HH_SENF_Utils_signalnames_ 1
 
 // Custom includes
 #include <string>
index dce43c0..b7b2814 100644 (file)
@@ -23,8 +23,8 @@
 /** \file
     \brief singleton public header */
 
-#ifndef HH_singleton_
-#define HH_singleton_ 1
+#ifndef HH_SENF_Utils_singleton_
+#define HH_SENF_Utils_singleton_ 1
 
 // Custom includes
 #include <boost/utility.hpp>
index 1e9667b..dd9ddb2 100644 (file)
@@ -23,8 +23,8 @@
 /** \file
     \brief type_traits public header */
 
-#ifndef HH_type_traits_
-#define HH_type_traits_ 1
+#ifndef HH_SENF_Utils_type_traits_
+#define HH_SENF_Utils_type_traits_ 1
 
 // Custom includes
 #include <boost/type_traits/function_traits.hpp>
index 7211395..85fac8b 100644 (file)
@@ -52,6 +52,8 @@
              "// Free Software Foundation, Inc.,\n"
              "// 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.\n"))
 
+(set (make-local-variable 'ccide-project-name) "SENF")
+
 (let ((local-conf (ccide-project-search-upwards "project-local.el")))
   (if local-conf
       (load-file local-conf)))