From 03f4e54b427ba0ed1a5fda8e938e545928122fd1 Mon Sep 17 00:00:00 2001
From: g0dil <g0dil@wiback.org>
Date: Tue, 18 Nov 2008 16:04:20 +0000
Subject: [PATCH] Packets: Fix VariantParser invalid parser access bug Clean up
all file-defines and remove all tabs
---
Examples/MultiMCLoop/MultiMCLoop.cc | 28 ++++++-------
Examples/psi2tsModule/psi2ts.hh | 4 +-
PPI/ActiveFeeder.hh | 4 +-
PPI/AnnotationRouter.hh | 4 +-
PPI/CloneSource.hh | 4 +-
PPI/Connectors.hh | 4 +-
PPI/Connectors.ih | 4 +-
PPI/DebugEvent.hh | 4 +-
PPI/DebugModules.hh | 4 +-
PPI/DiscardSink.hh | 4 +-
PPI/EventManager.hh | 4 +-
PPI/Events.hh | 4 +-
PPI/Events.ih | 4 +-
PPI/ForwardSwitch.hh | 6 +--
PPI/IOEvent.hh | 4 +-
PPI/IdleEvent.hh | 4 +-
PPI/IntervalTimer.hh | 4 +-
PPI/Joins.hh | 4 +-
PPI/Module.hh | 4 +-
PPI/Module.ih | 4 +-
PPI/ModuleManager.hh | 4 +-
PPI/PPI.hh | 4 +-
PPI/PassiveQueue.hh | 4 +-
PPI/Queueing.hh | 4 +-
PPI/RateFilter.hh | 6 +--
PPI/Route.hh | 4 +-
PPI/Route.ih | 4 +-
PPI/Setup.hh | 4 +-
PPI/SocketSink.hh | 4 +-
PPI/SocketSource.hh | 4 +-
PPI/ThrottleBarrier.hh | 4 +-
PPI/detail/Callback.hh | 4 +-
PPI/detail/EventBinding.hh | 4 +-
PPI/predecl.hh | 4 +-
Packets/ArrayParser.hh | 8 ++--
Packets/ArrayParser.ih | 4 +-
Packets/AuxParser.hh | 10 ++---
Packets/DataPacket.hh | 8 ++--
Packets/DefaultBundle/EthernetPacket.hh | 4 +-
Packets/DefaultBundle/IPv4Packet.hh | 4 +-
Packets/DefaultBundle/IPv6Extensions.hh | 4 +-
Packets/DefaultBundle/IPv6Packet.hh | 4 +-
Packets/DefaultBundle/LlcSnapPacket.hh | 4 +-
Packets/DefaultBundle/RTPPacket.hh | 4 +-
Packets/DefaultBundle/UDPPacket.hh | 4 +-
Packets/IntParser.hh | 8 ++--
Packets/IntParser.ih | 4 +-
Packets/ListBParser.hh | 8 ++--
Packets/ListBParser.ih | 4 +-
Packets/ListNParser.hh | 8 ++--
Packets/ListNParser.ih | 4 +-
Packets/ListParser.hh | 8 ++--
Packets/ListParser.ih | 4 +-
Packets/MPEGDVBBundle/DTCPPacket.hh | 4 +-
Packets/MPEGDVBBundle/MPESection.hh | 4 +-
Packets/MPEGDVBBundle/SNDUPacket.hh | 4 +-
Packets/MPEGDVBBundle/TLVPacket.hh | 4 +-
Packets/MPEGDVBBundle/TransportPacket.hh | 4 +-
Packets/Packet.hh | 8 ++--
Packets/PacketData.hh | 8 ++--
Packets/PacketImpl.hh | 8 ++--
Packets/PacketInterpreter.hh | 8 ++--
Packets/PacketParser.hh | 8 ++--
Packets/PacketParser.ih | 4 +-
Packets/PacketRegistry.hh | 8 ++--
Packets/PacketRegistry.ih | 4 +-
Packets/PacketType.hh | 8 ++--
Packets/PacketTypes.hh | 8 ++--
Packets/Packets.hh | 8 ++--
Packets/ParseHelpers.hh | 10 ++---
Packets/ParseHelpers.ih | 2 +-
Packets/SafeIterator.cti | 4 +-
Packets/SafeIterator.hh | 14 +++----
Packets/VariantParser.ct | 5 ++-
Packets/VariantParser.hh | 10 ++---
Packets/VariantParser.ih | 4 +-
Packets/VariantParser.test.cc | 13 ++++--
Packets/VectorParser.hh | 8 ++--
Packets/VectorParser.ih | 4 +-
Packets/main.test.hh | 4 +-
Scheduler/ClockService.hh | 4 +-
Scheduler/Console/Config.hh | 4 +-
Scheduler/Console/Config.ih | 4 +-
Scheduler/Console/ConfigFile.hh | 4 +-
Scheduler/Console/ConfigFile.ih | 4 +-
Scheduler/Console/Console.hh | 4 +-
Scheduler/Console/Executor.hh | 4 +-
Scheduler/Console/LazyDirectory.hh | 4 +-
Scheduler/Console/Node.hh | 4 +-
Scheduler/Console/Node.ih | 4 +-
Scheduler/Console/OverloadedCommand.hh | 4 +-
Scheduler/Console/Parse.hh | 4 +-
Scheduler/Console/Parse.ih | 4 +-
Scheduler/Console/ParsedCommand.hh | 4 +-
Scheduler/Console/ParsedCommand.ih | 4 +-
Scheduler/Console/ProgramOptions.hh | 4 +-
Scheduler/Console/ProgramOptions.ih | 4 +-
Scheduler/Console/Readline.hh | 4 +-
Scheduler/Console/ScopedDirectory.hh | 4 +-
Scheduler/Console/Server.hh | 4 +-
Scheduler/Console/Server.ih | 4 +-
Scheduler/Console/Sysdir.hh | 4 +-
Scheduler/Console/Sysdir.ih | 4 +-
Scheduler/Console/Traits.hh | 4 +-
Scheduler/Console/Traits.ih | 4 +-
Scheduler/Console/Variables.hh | 4 +-
Scheduler/Console/Variables.ih | 4 +-
Scheduler/EventHook.hh | 4 +-
Scheduler/EventHook.ih | 4 +-
Scheduler/EventManager.hh | 4 +-
Scheduler/FIFORunner.hh | 4 +-
Scheduler/FdEvent.cc | 20 ++++-----
Scheduler/FdEvent.cci | 2 +-
Scheduler/FdEvent.cti | 2 +-
Scheduler/FdEvent.hh | 42 +++++++++----------
Scheduler/FdEvent.ih | 42 +++++++++----------
Scheduler/FdManager.hh | 4 +-
Scheduler/Poller.hh | 4 +-
Scheduler/ReadHelper.hh | 4 +-
Scheduler/ReadHelper.ih | 4 +-
Scheduler/Scheduler.hh | 4 +-
Scheduler/SignalEvent.hh | 4 +-
Scheduler/SignalEvent.ih | 4 +-
Scheduler/TimerEvent.hh | 4 +-
Scheduler/TimerEvent.ih | 4 +-
Scheduler/WriteHelper.hh | 4 +-
Socket/AddressingPolicy.hh | 4 +-
Socket/ClientSocketHandle.hh | 4 +-
Socket/ClientSocketHandle.ih | 4 +-
Socket/CommunicationPolicy.hh | 4 +-
Socket/FileHandle.hh | 4 +-
Socket/FileHandle.ih | 4 +-
Socket/FramingPolicy.hh | 4 +-
Socket/NetdeviceController.hh | 4 +-
Socket/ProtocolClientSocketHandle.hh | 4 +-
Socket/ProtocolServerSocketHandle.hh | 4 +-
Socket/ProtocolServerSocketHandle.mpp | 6 +--
Socket/Protocols/AddressExceptions.hh | 4 +-
Socket/Protocols/BSDAddressingPolicy.hh | 4 +-
Socket/Protocols/BSDSocketAddress.hh | 4 +-
Socket/Protocols/BSDSocketProtocol.hh | 4 +-
Socket/Protocols/DVB/DVB.hh | 4 +-
Socket/Protocols/DVB/DVBDemuxHandles.hh | 4 +-
.../Protocols/DVB/DVBDemuxSocketProtocol.hh | 4 +-
Socket/Protocols/DVB/DVBFrontendHandle.cc | 2 +-
Socket/Protocols/DVB/DVBFrontendHandle.hh | 4 +-
Socket/Protocols/DatagramSocketProtocol.hh | 4 +-
.../INet/ConnectedRawINetSocketHandle.hh | 6 +--
.../INet/ConnectedUDPSocketHandle.hh | 4 +-
Socket/Protocols/INet/INet.hh | 4 +-
Socket/Protocols/INet/INet4Address.hh | 4 +-
Socket/Protocols/INet/INet6Address.hh | 4 +-
Socket/Protocols/INet/INet6Address.ih | 4 +-
Socket/Protocols/INet/INetAddressing.hh | 4 +-
Socket/Protocols/INet/INetSocketProtocol.hh | 4 +-
.../Protocols/INet/MulticastSocketProtocol.hh | 4 +-
Socket/Protocols/INet/RawINetSocketHandle.hh | 6 +--
.../Protocols/INet/RawINetSocketProtocol.hh | 6 +--
Socket/Protocols/INet/TCPSocketHandle.hh | 4 +-
Socket/Protocols/INet/TCPSocketProtocol.hh | 4 +-
Socket/Protocols/INet/UDPSocketHandle.hh | 4 +-
Socket/Protocols/INet/UDPSocketProtocol.hh | 4 +-
Socket/Protocols/Raw/LLAddressing.hh | 4 +-
Socket/Protocols/Raw/MACAddress.cc | 6 +--
Socket/Protocols/Raw/MACAddress.hh | 4 +-
Socket/Protocols/Raw/MACAddress.test.cc | 2 +-
Socket/Protocols/Raw/PacketSocketHandle.hh | 4 +-
Socket/Protocols/Raw/Raw.hh | 4 +-
Socket/Protocols/Raw/TunTapSocketHandle.hh | 4 +-
.../UN/ConnectedUNDatagramSocketHandle.hh | 4 +-
Socket/Protocols/UN/UN.hh | 4 +-
Socket/Protocols/UN/UNAddressing.hh | 4 +-
Socket/Protocols/UN/UNDatagramSocketHandle.hh | 4 +-
Socket/Protocols/UN/UNSocketProtocol.hh | 4 +-
Socket/ReadWritePolicy.hh | 4 +-
Socket/ServerSocketHandle.hh | 4 +-
Socket/Socket.hh | 4 +-
Socket/SocketHandle.hh | 4 +-
Socket/SocketHandle.ih | 4 +-
Socket/SocketPolicy.hh | 4 +-
Socket/SocketPolicy.ih | 4 +-
Socket/SocketPolicy.test.hh | 4 +-
Socket/SocketProtocol.hh | 4 +-
Socket/SocketProtocol.test.hh | 4 +-
Utils/Backtrace.hh | 4 +-
Utils/Buffer.hh | 4 +-
Utils/Daemon/Daemon.hh | 4 +-
Utils/Daemon/Daemon.ih | 4 +-
Utils/Exception.hh | 4 +-
Utils/IpChecksum.hh | 4 +-
Utils/IteratorTraits.hh | 4 +-
Utils/IteratorTraits.ih | 4 +-
Utils/Logger/AreaRegistry.hh | 4 +-
Utils/Logger/AreaRegistry.ih | 4 +-
Utils/Logger/Config.hh | 4 +-
Utils/Logger/Config.ih | 4 +-
Utils/Logger/ConsoleTarget.hh | 4 +-
Utils/Logger/Definitions.hh | 4 +-
Utils/Logger/Definitions.ih | 4 +-
Utils/Logger/FileTarget.hh | 4 +-
Utils/Logger/IOStreamTarget.hh | 4 +-
Utils/Logger/Levels.hh | 4 +-
Utils/Logger/Levels.ih | 4 +-
Utils/Logger/Log.hh | 4 +-
Utils/Logger/Log.ih | 4 +-
Utils/Logger/Logger.hh | 4 +-
Utils/Logger/Parameters.hh | 4 +-
Utils/Logger/Parameters.ih | 4 +-
Utils/Logger/SenfLog.hh | 4 +-
Utils/Logger/StreamRegistry.hh | 4 +-
Utils/Logger/StreamRegistry.ih | 4 +-
Utils/Logger/StringTarget.hh | 4 +-
Utils/Logger/SyslogTarget.hh | 4 +-
Utils/Logger/Target.hh | 4 +-
Utils/Logger/Target.ih | 4 +-
Utils/Logger/TimeSource.hh | 4 +-
Utils/Logger/TimeSource.ih | 4 +-
Utils/Logger/main.test.hh | 4 +-
Utils/Phoenix.hh | 4 +-
Utils/Phoenix.ih | 4 +-
Utils/Range.hh | 4 +-
Utils/String.hh | 4 +-
Utils/Tags.hh | 4 +-
Utils/TypeIdValue.hh | 4 +-
Utils/TypeInfo.hh | 4 +-
Utils/auto_unit_test.hh | 4 +-
Utils/hexdump.hh | 4 +-
Utils/hexdump.ih | 4 +-
Utils/intrusive_refcount.hh | 4 +-
Utils/membind.hh | 4 +-
Utils/mpl.hh | 4 +-
Utils/mpl.ih | 4 +-
Utils/parameter.hh | 4 +-
Utils/pool_alloc_mixin.hh | 4 +-
Utils/preprocessor.hh | 4 +-
Utils/range.hh | 4 +-
Utils/safe_bool.hh | 4 +-
Utils/senfassert.hh | 4 +-
Utils/signalnames.hh | 4 +-
Utils/singleton.hh | 4 +-
Utils/type_traits.hh | 4 +-
project.el | 2 +
242 files changed, 599 insertions(+), 589 deletions(-)
diff --git a/Examples/MultiMCLoop/MultiMCLoop.cc b/Examples/MultiMCLoop/MultiMCLoop.cc
index e5981340d..cba9bb92d 100644
--- a/Examples/MultiMCLoop/MultiMCLoop.cc
+++ b/Examples/MultiMCLoop/MultiMCLoop.cc
@@ -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;
}
};
diff --git a/Examples/psi2tsModule/psi2ts.hh b/Examples/psi2tsModule/psi2ts.hh
index 14d25bda5..141bfdacf 100644
--- a/Examples/psi2tsModule/psi2ts.hh
+++ b/Examples/psi2tsModule/psi2ts.hh
@@ -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>
diff --git a/PPI/ActiveFeeder.hh b/PPI/ActiveFeeder.hh
index 494f1eadc..cc2ffc16f 100644
--- a/PPI/ActiveFeeder.hh
+++ b/PPI/ActiveFeeder.hh
@@ -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"
diff --git a/PPI/AnnotationRouter.hh b/PPI/AnnotationRouter.hh
index 6b98b155e..a186fd5eb 100644
--- a/PPI/AnnotationRouter.hh
+++ b/PPI/AnnotationRouter.hh
@@ -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>
diff --git a/PPI/CloneSource.hh b/PPI/CloneSource.hh
index 6dd800046..3c767c9b2 100644
--- a/PPI/CloneSource.hh
+++ b/PPI/CloneSource.hh
@@ -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"
diff --git a/PPI/Connectors.hh b/PPI/Connectors.hh
index e5ea9c91c..07316b627 100644
--- a/PPI/Connectors.hh
+++ b/PPI/Connectors.hh
@@ -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>
diff --git a/PPI/Connectors.ih b/PPI/Connectors.ih
index d2a8e4c0b..1a40cebf0 100644
--- a/PPI/Connectors.ih
+++ b/PPI/Connectors.ih
@@ -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
diff --git a/PPI/DebugEvent.hh b/PPI/DebugEvent.hh
index 9215d26a7..12268f646 100644
--- a/PPI/DebugEvent.hh
+++ b/PPI/DebugEvent.hh
@@ -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"
diff --git a/PPI/DebugModules.hh b/PPI/DebugModules.hh
index 85e51eb6b..b82644793 100644
--- a/PPI/DebugModules.hh
+++ b/PPI/DebugModules.hh
@@ -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>
diff --git a/PPI/DiscardSink.hh b/PPI/DiscardSink.hh
index 39a16dd70..3bce6ec70 100644
--- a/PPI/DiscardSink.hh
+++ b/PPI/DiscardSink.hh
@@ -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"
diff --git a/PPI/EventManager.hh b/PPI/EventManager.hh
index d6de856f7..20535a036 100644
--- a/PPI/EventManager.hh
+++ b/PPI/EventManager.hh
@@ -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>
diff --git a/PPI/Events.hh b/PPI/Events.hh
index b3717bdc1..3f2fc25b2 100644
--- a/PPI/Events.hh
+++ b/PPI/Events.hh
@@ -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>
diff --git a/PPI/Events.ih b/PPI/Events.ih
index a2354c869..8ce96161c 100644
--- a/PPI/Events.ih
+++ b/PPI/Events.ih
@@ -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
diff --git a/PPI/ForwardSwitch.hh b/PPI/ForwardSwitch.hh
index 2b2fa71da..20649bff8 100644
--- a/PPI/ForwardSwitch.hh
+++ b/PPI/ForwardSwitch.hh
@@ -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_*/
diff --git a/PPI/IOEvent.hh b/PPI/IOEvent.hh
index d9d771db8..7b3bf4818 100644
--- a/PPI/IOEvent.hh
+++ b/PPI/IOEvent.hh
@@ -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"
diff --git a/PPI/IdleEvent.hh b/PPI/IdleEvent.hh
index 51656ea31..128dcba8a 100644
--- a/PPI/IdleEvent.hh
+++ b/PPI/IdleEvent.hh
@@ -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"
diff --git a/PPI/IntervalTimer.hh b/PPI/IntervalTimer.hh
index 1763f3546..98228e47e 100644
--- a/PPI/IntervalTimer.hh
+++ b/PPI/IntervalTimer.hh
@@ -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"
diff --git a/PPI/Joins.hh b/PPI/Joins.hh
index 77cb333b8..266e80740 100644
--- a/PPI/Joins.hh
+++ b/PPI/Joins.hh
@@ -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>
diff --git a/PPI/Module.hh b/PPI/Module.hh
index c2faf562a..97f1c11c6 100644
--- a/PPI/Module.hh
+++ b/PPI/Module.hh
@@ -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>
diff --git a/PPI/Module.ih b/PPI/Module.ih
index 05382639e..9d208128c 100644
--- a/PPI/Module.ih
+++ b/PPI/Module.ih
@@ -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
diff --git a/PPI/ModuleManager.hh b/PPI/ModuleManager.hh
index 76ba447da..14ad1a925 100644
--- a/PPI/ModuleManager.hh
+++ b/PPI/ModuleManager.hh
@@ -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>
diff --git a/PPI/PPI.hh b/PPI/PPI.hh
index 536a22ee4..c252245c0 100644
--- a/PPI/PPI.hh
+++ b/PPI/PPI.hh
@@ -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"
diff --git a/PPI/PassiveQueue.hh b/PPI/PassiveQueue.hh
index 2412c4aca..12cb25add 100644
--- a/PPI/PassiveQueue.hh
+++ b/PPI/PassiveQueue.hh
@@ -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"
diff --git a/PPI/Queueing.hh b/PPI/Queueing.hh
index 16cecb4a5..5ed6a9ff8 100644
--- a/PPI/Queueing.hh
+++ b/PPI/Queueing.hh
@@ -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"
diff --git a/PPI/RateFilter.hh b/PPI/RateFilter.hh
index 58f330be6..bd681701a 100644
--- a/PPI/RateFilter.hh
+++ b/PPI/RateFilter.hh
@@ -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_*/
diff --git a/PPI/Route.hh b/PPI/Route.hh
index fa59c9679..fb2930597 100644
--- a/PPI/Route.hh
+++ b/PPI/Route.hh
@@ -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>
diff --git a/PPI/Route.ih b/PPI/Route.ih
index 76125e3ba..31a4e5b31 100644
--- a/PPI/Route.ih
+++ b/PPI/Route.ih
@@ -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>
diff --git a/PPI/Setup.hh b/PPI/Setup.hh
index 021d52894..9a06fa4e2 100644
--- a/PPI/Setup.hh
+++ b/PPI/Setup.hh
@@ -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>
diff --git a/PPI/SocketSink.hh b/PPI/SocketSink.hh
index f7f61a55d..a5c384b23 100644
--- a/PPI/SocketSink.hh
+++ b/PPI/SocketSink.hh
@@ -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"
diff --git a/PPI/SocketSource.hh b/PPI/SocketSource.hh
index a74fdbcad..49c863ff4 100644
--- a/PPI/SocketSource.hh
+++ b/PPI/SocketSource.hh
@@ -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"
diff --git a/PPI/ThrottleBarrier.hh b/PPI/ThrottleBarrier.hh
index a58935e7a..4addc8392 100644
--- a/PPI/ThrottleBarrier.hh
+++ b/PPI/ThrottleBarrier.hh
@@ -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"
diff --git a/PPI/detail/Callback.hh b/PPI/detail/Callback.hh
index f5b3cff9f..edecc0b86 100644
--- a/PPI/detail/Callback.hh
+++ b/PPI/detail/Callback.hh
@@ -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>
diff --git a/PPI/detail/EventBinding.hh b/PPI/detail/EventBinding.hh
index 93089dec1..f4898797c 100644
--- a/PPI/detail/EventBinding.hh
+++ b/PPI/detail/EventBinding.hh
@@ -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"
diff --git a/PPI/predecl.hh b/PPI/predecl.hh
index 703007249..ef6e17b72 100644
--- a/PPI/predecl.hh
+++ b/PPI/predecl.hh
@@ -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
diff --git a/Packets/ArrayParser.hh b/Packets/ArrayParser.hh
index ffe2cb0a8..0c113371b 100644
--- a/Packets/ArrayParser.hh
+++ b/Packets/ArrayParser.hh
@@ -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"
diff --git a/Packets/ArrayParser.ih b/Packets/ArrayParser.ih
index 2dec0cc48..bb97cef40 100644
--- a/Packets/ArrayParser.ih
+++ b/Packets/ArrayParser.ih
@@ -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>
diff --git a/Packets/AuxParser.hh b/Packets/AuxParser.hh
index fdf47c84a..c76926c4b 100644
--- a/Packets/AuxParser.hh
+++ b/Packets/AuxParser.hh
@@ -23,10 +23,10 @@
/** \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"
diff --git a/Packets/DataPacket.hh b/Packets/DataPacket.hh
index ae2b39e75..fc8cd048f 100644
--- a/Packets/DataPacket.hh
+++ b/Packets/DataPacket.hh
@@ -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"
diff --git a/Packets/DefaultBundle/EthernetPacket.hh b/Packets/DefaultBundle/EthernetPacket.hh
index aadcddeac..bac25549d 100644
--- a/Packets/DefaultBundle/EthernetPacket.hh
+++ b/Packets/DefaultBundle/EthernetPacket.hh
@@ -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>
diff --git a/Packets/DefaultBundle/IPv4Packet.hh b/Packets/DefaultBundle/IPv4Packet.hh
index 496c9b8e4..c1e367b18 100644
--- a/Packets/DefaultBundle/IPv4Packet.hh
+++ b/Packets/DefaultBundle/IPv4Packet.hh
@@ -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"
diff --git a/Packets/DefaultBundle/IPv6Extensions.hh b/Packets/DefaultBundle/IPv6Extensions.hh
index d40510aed..91ac6104a 100644
--- a/Packets/DefaultBundle/IPv6Extensions.hh
+++ b/Packets/DefaultBundle/IPv6Extensions.hh
@@ -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"
diff --git a/Packets/DefaultBundle/IPv6Packet.hh b/Packets/DefaultBundle/IPv6Packet.hh
index 400691854..63815d835 100644
--- a/Packets/DefaultBundle/IPv6Packet.hh
+++ b/Packets/DefaultBundle/IPv6Packet.hh
@@ -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"
diff --git a/Packets/DefaultBundle/LlcSnapPacket.hh b/Packets/DefaultBundle/LlcSnapPacket.hh
index d7d05b81e..037b61fcf 100644
--- a/Packets/DefaultBundle/LlcSnapPacket.hh
+++ b/Packets/DefaultBundle/LlcSnapPacket.hh
@@ -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>
diff --git a/Packets/DefaultBundle/RTPPacket.hh b/Packets/DefaultBundle/RTPPacket.hh
index cd17bc351..5a2785d0c 100644
--- a/Packets/DefaultBundle/RTPPacket.hh
+++ b/Packets/DefaultBundle/RTPPacket.hh
@@ -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"
diff --git a/Packets/DefaultBundle/UDPPacket.hh b/Packets/DefaultBundle/UDPPacket.hh
index dc82ea2ff..8b1aa70f9 100644
--- a/Packets/DefaultBundle/UDPPacket.hh
+++ b/Packets/DefaultBundle/UDPPacket.hh
@@ -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"
diff --git a/Packets/IntParser.hh b/Packets/IntParser.hh
index eb51170b6..4b4a985f5 100644
--- a/Packets/IntParser.hh
+++ b/Packets/IntParser.hh
@@ -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"
diff --git a/Packets/IntParser.ih b/Packets/IntParser.ih
index fdc7b8563..d496b73e3 100644
--- a/Packets/IntParser.ih
+++ b/Packets/IntParser.ih
@@ -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"
diff --git a/Packets/ListBParser.hh b/Packets/ListBParser.hh
index 7b66813ed..76227c0b5 100644
--- a/Packets/ListBParser.hh
+++ b/Packets/ListBParser.hh
@@ -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"
diff --git a/Packets/ListBParser.ih b/Packets/ListBParser.ih
index 2396e1d66..fe61177ae 100644
--- a/Packets/ListBParser.ih
+++ b/Packets/ListBParser.ih
@@ -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"
diff --git a/Packets/ListNParser.hh b/Packets/ListNParser.hh
index 2d96b566e..8ee812457 100644
--- a/Packets/ListNParser.hh
+++ b/Packets/ListNParser.hh
@@ -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"
diff --git a/Packets/ListNParser.ih b/Packets/ListNParser.ih
index 2931359f6..db54348d8 100644
--- a/Packets/ListNParser.ih
+++ b/Packets/ListNParser.ih
@@ -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"
diff --git a/Packets/ListParser.hh b/Packets/ListParser.hh
index 0382caa4a..004e77f02 100644
--- a/Packets/ListParser.hh
+++ b/Packets/ListParser.hh
@@ -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"
diff --git a/Packets/ListParser.ih b/Packets/ListParser.ih
index f756410b0..0be4b029a 100644
--- a/Packets/ListParser.ih
+++ b/Packets/ListParser.ih
@@ -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>
diff --git a/Packets/MPEGDVBBundle/DTCPPacket.hh b/Packets/MPEGDVBBundle/DTCPPacket.hh
index 128cac0ea..d3a8e05d1 100644
--- a/Packets/MPEGDVBBundle/DTCPPacket.hh
+++ b/Packets/MPEGDVBBundle/DTCPPacket.hh
@@ -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"
diff --git a/Packets/MPEGDVBBundle/MPESection.hh b/Packets/MPEGDVBBundle/MPESection.hh
index 702f546d0..7b7879db3 100644
--- a/Packets/MPEGDVBBundle/MPESection.hh
+++ b/Packets/MPEGDVBBundle/MPESection.hh
@@ -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>
diff --git a/Packets/MPEGDVBBundle/SNDUPacket.hh b/Packets/MPEGDVBBundle/SNDUPacket.hh
index fbbd16bbb..4f296acf2 100644
--- a/Packets/MPEGDVBBundle/SNDUPacket.hh
+++ b/Packets/MPEGDVBBundle/SNDUPacket.hh
@@ -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>
diff --git a/Packets/MPEGDVBBundle/TLVPacket.hh b/Packets/MPEGDVBBundle/TLVPacket.hh
index 492507519..f033a4d46 100644
--- a/Packets/MPEGDVBBundle/TLVPacket.hh
+++ b/Packets/MPEGDVBBundle/TLVPacket.hh
@@ -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>
diff --git a/Packets/MPEGDVBBundle/TransportPacket.hh b/Packets/MPEGDVBBundle/TransportPacket.hh
index 5ff4889bd..ae1f540b8 100644
--- a/Packets/MPEGDVBBundle/TransportPacket.hh
+++ b/Packets/MPEGDVBBundle/TransportPacket.hh
@@ -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"
diff --git a/Packets/Packet.hh b/Packets/Packet.hh
index ac77eedd9..3d51f78ba 100644
--- a/Packets/Packet.hh
+++ b/Packets/Packet.hh
@@ -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"
diff --git a/Packets/PacketData.hh b/Packets/PacketData.hh
index d63e01ad8..77602004a 100644
--- a/Packets/PacketData.hh
+++ b/Packets/PacketData.hh
@@ -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"
diff --git a/Packets/PacketImpl.hh b/Packets/PacketImpl.hh
index 667eebb15..1933949a3 100644
--- a/Packets/PacketImpl.hh
+++ b/Packets/PacketImpl.hh
@@ -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"
diff --git a/Packets/PacketInterpreter.hh b/Packets/PacketInterpreter.hh
index 790c600cd..66fc03f8e 100644
--- a/Packets/PacketInterpreter.hh
+++ b/Packets/PacketInterpreter.hh
@@ -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"
diff --git a/Packets/PacketParser.hh b/Packets/PacketParser.hh
index 59124e3c8..8c218e06b 100644
--- a/Packets/PacketParser.hh
+++ b/Packets/PacketParser.hh
@@ -150,8 +150,8 @@
<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"
diff --git a/Packets/PacketParser.ih b/Packets/PacketParser.ih
index 4596ea8e3..00df8a802 100644
--- a/Packets/PacketParser.ih
+++ b/Packets/PacketParser.ih
@@ -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"
diff --git a/Packets/PacketRegistry.hh b/Packets/PacketRegistry.hh
index a17449cb9..1fa7d99f8 100644
--- a/Packets/PacketRegistry.hh
+++ b/Packets/PacketRegistry.hh
@@ -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"
diff --git a/Packets/PacketRegistry.ih b/Packets/PacketRegistry.ih
index 32139e716..af1627868 100644
--- a/Packets/PacketRegistry.ih
+++ b/Packets/PacketRegistry.ih
@@ -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>
diff --git a/Packets/PacketType.hh b/Packets/PacketType.hh
index a5b671df2..e97380b5f 100644
--- a/Packets/PacketType.hh
+++ b/Packets/PacketType.hh
@@ -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"
diff --git a/Packets/PacketTypes.hh b/Packets/PacketTypes.hh
index 3cf7a9c5d..fe229a64d 100644
--- a/Packets/PacketTypes.hh
+++ b/Packets/PacketTypes.hh
@@ -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"
diff --git a/Packets/Packets.hh b/Packets/Packets.hh
index 90036c002..ea0e3182c 100644
--- a/Packets/Packets.hh
+++ b/Packets/Packets.hh
@@ -23,10 +23,10 @@
/** \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"
diff --git a/Packets/ParseHelpers.hh b/Packets/ParseHelpers.hh
index a8d5fbda1..ef5ec450b 100644
--- a/Packets/ParseHelpers.hh
+++ b/Packets/ParseHelpers.hh
@@ -23,10 +23,10 @@
/** \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
@@ -691,8 +691,8 @@
///////////////////////////////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"
diff --git a/Packets/ParseHelpers.ih b/Packets/ParseHelpers.ih
index cdf8f7447..6392b693e 100644
--- a/Packets/ParseHelpers.ih
+++ b/Packets/ParseHelpers.ih
@@ -572,7 +572,7 @@
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)>()); } \
diff --git a/Packets/SafeIterator.cti b/Packets/SafeIterator.cti
index f845b7885..a798945f6 100644
--- a/Packets/SafeIterator.cti
+++ b/Packets/SafeIterator.cti
@@ -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_ );
diff --git a/Packets/SafeIterator.hh b/Packets/SafeIterator.hh
index 44982a719..b0ff4bfbc 100644
--- a/Packets/SafeIterator.hh
+++ b/Packets/SafeIterator.hh
@@ -23,10 +23,10 @@
/** \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"
diff --git a/Packets/VariantParser.ct b/Packets/VariantParser.ct
index bae313928..b0ba3e819 100644
--- a/Packets/VariantParser.ct
+++ b/Packets/VariantParser.ct
@@ -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);
diff --git a/Packets/VariantParser.hh b/Packets/VariantParser.hh
index a76900e98..17b0ca414 100644
--- a/Packets/VariantParser.hh
+++ b/Packets/VariantParser.hh
@@ -23,10 +23,10 @@
/** \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"
diff --git a/Packets/VariantParser.ih b/Packets/VariantParser.ih
index 275cff1fe..d667f8608 100644
--- a/Packets/VariantParser.ih
+++ b/Packets/VariantParser.ih
@@ -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"
diff --git a/Packets/VariantParser.test.cc b/Packets/VariantParser.test.cc
index 2ea65d492..1bf32545a 100644
--- a/Packets/VariantParser.test.cc
+++ b/Packets/VariantParser.test.cc
@@ -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);
diff --git a/Packets/VectorParser.hh b/Packets/VectorParser.hh
index b1254dbf2..34b2c2921 100644
--- a/Packets/VectorParser.hh
+++ b/Packets/VectorParser.hh
@@ -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"
diff --git a/Packets/VectorParser.ih b/Packets/VectorParser.ih
index 6f82bc02c..bd46aa116 100644
--- a/Packets/VectorParser.ih
+++ b/Packets/VectorParser.ih
@@ -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
diff --git a/Packets/main.test.hh b/Packets/main.test.hh
index b3a744ce4..ecd472cf2 100644
--- a/Packets/main.test.hh
+++ b/Packets/main.test.hh
@@ -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
diff --git a/Scheduler/ClockService.hh b/Scheduler/ClockService.hh
index bad8b6e2e..02082ea05 100644
--- a/Scheduler/ClockService.hh
+++ b/Scheduler/ClockService.hh
@@ -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>
diff --git a/Scheduler/Console/Config.hh b/Scheduler/Console/Config.hh
index f5804b799..4ef6fb0c0 100644
--- a/Scheduler/Console/Config.hh
+++ b/Scheduler/Console/Config.hh
@@ -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>
diff --git a/Scheduler/Console/Config.ih b/Scheduler/Console/Config.ih
index 208abb22f..bb0e55ecd 100644
--- a/Scheduler/Console/Config.ih
+++ b/Scheduler/Console/Config.ih
@@ -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>
diff --git a/Scheduler/Console/ConfigFile.hh b/Scheduler/Console/ConfigFile.hh
index 8b5a29107..15414fbed 100644
--- a/Scheduler/Console/ConfigFile.hh
+++ b/Scheduler/Console/ConfigFile.hh
@@ -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"
diff --git a/Scheduler/Console/ConfigFile.ih b/Scheduler/Console/ConfigFile.ih
index 59df5a9b5..80191d015 100644
--- a/Scheduler/Console/ConfigFile.ih
+++ b/Scheduler/Console/ConfigFile.ih
@@ -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
diff --git a/Scheduler/Console/Console.hh b/Scheduler/Console/Console.hh
index 66892a324..c75f99555 100644
--- a/Scheduler/Console/Console.hh
+++ b/Scheduler/Console/Console.hh
@@ -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
diff --git a/Scheduler/Console/Executor.hh b/Scheduler/Console/Executor.hh
index 1f27f48ef..7538eff22 100644
--- a/Scheduler/Console/Executor.hh
+++ b/Scheduler/Console/Executor.hh
@@ -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>
diff --git a/Scheduler/Console/LazyDirectory.hh b/Scheduler/Console/LazyDirectory.hh
index 041bc425f..38f0f0db0 100644
--- a/Scheduler/Console/LazyDirectory.hh
+++ b/Scheduler/Console/LazyDirectory.hh
@@ -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>
diff --git a/Scheduler/Console/Node.hh b/Scheduler/Console/Node.hh
index 05a4e920e..8c4b66842 100644
--- a/Scheduler/Console/Node.hh
+++ b/Scheduler/Console/Node.hh
@@ -194,8 +194,8 @@
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>
diff --git a/Scheduler/Console/Node.ih b/Scheduler/Console/Node.ih
index 1a02bdd55..421d744c2 100644
--- a/Scheduler/Console/Node.ih
+++ b/Scheduler/Console/Node.ih
@@ -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
diff --git a/Scheduler/Console/OverloadedCommand.hh b/Scheduler/Console/OverloadedCommand.hh
index c39ff519a..ee9bde99f 100644
--- a/Scheduler/Console/OverloadedCommand.hh
+++ b/Scheduler/Console/OverloadedCommand.hh
@@ -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"
diff --git a/Scheduler/Console/Parse.hh b/Scheduler/Console/Parse.hh
index 59b0a3b37..cfa871be5 100644
--- a/Scheduler/Console/Parse.hh
+++ b/Scheduler/Console/Parse.hh
@@ -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
diff --git a/Scheduler/Console/Parse.ih b/Scheduler/Console/Parse.ih
index 61c5cee47..afb4b78c2 100644
--- a/Scheduler/Console/Parse.ih
+++ b/Scheduler/Console/Parse.ih
@@ -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>
diff --git a/Scheduler/Console/ParsedCommand.hh b/Scheduler/Console/ParsedCommand.hh
index 6604dd348..4de6952de 100644
--- a/Scheduler/Console/ParsedCommand.hh
+++ b/Scheduler/Console/ParsedCommand.hh
@@ -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
diff --git a/Scheduler/Console/ParsedCommand.ih b/Scheduler/Console/ParsedCommand.ih
index c33944520..0e2202165 100644
--- a/Scheduler/Console/ParsedCommand.ih
+++ b/Scheduler/Console/ParsedCommand.ih
@@ -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>
diff --git a/Scheduler/Console/ProgramOptions.hh b/Scheduler/Console/ProgramOptions.hh
index d8f819ec0..2f985f349 100644
--- a/Scheduler/Console/ProgramOptions.hh
+++ b/Scheduler/Console/ProgramOptions.hh
@@ -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"
diff --git a/Scheduler/Console/ProgramOptions.ih b/Scheduler/Console/ProgramOptions.ih
index d99d899f9..7bbbf0cc3 100644
--- a/Scheduler/Console/ProgramOptions.ih
+++ b/Scheduler/Console/ProgramOptions.ih
@@ -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>
diff --git a/Scheduler/Console/Readline.hh b/Scheduler/Console/Readline.hh
index 3daf49005..2b6a67215 100644
--- a/Scheduler/Console/Readline.hh
+++ b/Scheduler/Console/Readline.hh
@@ -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>
diff --git a/Scheduler/Console/ScopedDirectory.hh b/Scheduler/Console/ScopedDirectory.hh
index f82375aff..512386e37 100644
--- a/Scheduler/Console/ScopedDirectory.hh
+++ b/Scheduler/Console/ScopedDirectory.hh
@@ -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>
diff --git a/Scheduler/Console/Server.hh b/Scheduler/Console/Server.hh
index 7ccf28409..dfd0cf312 100644
--- a/Scheduler/Console/Server.hh
+++ b/Scheduler/Console/Server.hh
@@ -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>
diff --git a/Scheduler/Console/Server.ih b/Scheduler/Console/Server.ih
index 332512a19..9db9d4cee 100644
--- a/Scheduler/Console/Server.ih
+++ b/Scheduler/Console/Server.ih
@@ -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>
diff --git a/Scheduler/Console/Sysdir.hh b/Scheduler/Console/Sysdir.hh
index 06fb0863c..fca560178 100644
--- a/Scheduler/Console/Sysdir.hh
+++ b/Scheduler/Console/Sysdir.hh
@@ -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"
diff --git a/Scheduler/Console/Sysdir.ih b/Scheduler/Console/Sysdir.ih
index 56ab1fcc7..3e895341c 100644
--- a/Scheduler/Console/Sysdir.ih
+++ b/Scheduler/Console/Sysdir.ih
@@ -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
diff --git a/Scheduler/Console/Traits.hh b/Scheduler/Console/Traits.hh
index 900b2b18d..d479f45b7 100644
--- a/Scheduler/Console/Traits.hh
+++ b/Scheduler/Console/Traits.hh
@@ -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>
diff --git a/Scheduler/Console/Traits.ih b/Scheduler/Console/Traits.ih
index 7d97e7076..b9f3b1ba7 100644
--- a/Scheduler/Console/Traits.ih
+++ b/Scheduler/Console/Traits.ih
@@ -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>
diff --git a/Scheduler/Console/Variables.hh b/Scheduler/Console/Variables.hh
index d8a946801..2ce1dd267 100644
--- a/Scheduler/Console/Variables.hh
+++ b/Scheduler/Console/Variables.hh
@@ -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>
diff --git a/Scheduler/Console/Variables.ih b/Scheduler/Console/Variables.ih
index 3772fd0c7..0f703aa0a 100644
--- a/Scheduler/Console/Variables.ih
+++ b/Scheduler/Console/Variables.ih
@@ -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>
diff --git a/Scheduler/EventHook.hh b/Scheduler/EventHook.hh
index d59414fc6..443778035 100644
--- a/Scheduler/EventHook.hh
+++ b/Scheduler/EventHook.hh
@@ -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>
diff --git a/Scheduler/EventHook.ih b/Scheduler/EventHook.ih
index e526bce74..2bed1bb5f 100644
--- a/Scheduler/EventHook.ih
+++ b/Scheduler/EventHook.ih
@@ -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"
diff --git a/Scheduler/EventManager.hh b/Scheduler/EventManager.hh
index f08f0191c..3c156fea5 100644
--- a/Scheduler/EventManager.hh
+++ b/Scheduler/EventManager.hh
@@ -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>
diff --git a/Scheduler/FIFORunner.hh b/Scheduler/FIFORunner.hh
index 8803f7590..11ab3ee73 100644
--- a/Scheduler/FIFORunner.hh
+++ b/Scheduler/FIFORunner.hh
@@ -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>
diff --git a/Scheduler/FdEvent.cc b/Scheduler/FdEvent.cc
index e3500ca14..afe10c7ef 100644
--- a/Scheduler/FdEvent.cc
+++ b/Scheduler/FdEvent.cc
@@ -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();
}
}
diff --git a/Scheduler/FdEvent.cci b/Scheduler/FdEvent.cci
index 9404a5c21..9efe73721 100644
--- a/Scheduler/FdEvent.cci
+++ b/Scheduler/FdEvent.cci
@@ -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)
diff --git a/Scheduler/FdEvent.cti b/Scheduler/FdEvent.cti
index 317a4eb07..ff752bc91 100644
--- a/Scheduler/FdEvent.cti
+++ b/Scheduler/FdEvent.cti
@@ -41,7 +41,7 @@ prefix_ senf::scheduler::FdEvent::FdEvent(std::string const & name, Callback con
pollable_ (true), events_ (events)
{
if (initiallyEnabled)
- enable();
+ enable();
}
///////////////////////////////////////////////////////////////////////////
diff --git a/Scheduler/FdEvent.hh b/Scheduler/FdEvent.hh
index 6080d0d5c..1c058780b 100644
--- a/Scheduler/FdEvent.hh
+++ b/Scheduler/FdEvent.hh
@@ -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;
diff --git a/Scheduler/FdEvent.ih b/Scheduler/FdEvent.ih
index bcb98a9f3..940a05794 100644
--- a/Scheduler/FdEvent.ih
+++ b/Scheduler/FdEvent.ih
@@ -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_;
diff --git a/Scheduler/FdManager.hh b/Scheduler/FdManager.hh
index f43203244..bf5442023 100644
--- a/Scheduler/FdManager.hh
+++ b/Scheduler/FdManager.hh
@@ -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"
diff --git a/Scheduler/Poller.hh b/Scheduler/Poller.hh
index 68f96fe4a..bc299534e 100644
--- a/Scheduler/Poller.hh
+++ b/Scheduler/Poller.hh
@@ -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>
diff --git a/Scheduler/ReadHelper.hh b/Scheduler/ReadHelper.hh
index 85965e57b..011b51a37 100644
--- a/Scheduler/ReadHelper.hh
+++ b/Scheduler/ReadHelper.hh
@@ -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>
diff --git a/Scheduler/ReadHelper.ih b/Scheduler/ReadHelper.ih
index 619574b54..19ffa1776 100644
--- a/Scheduler/ReadHelper.ih
+++ b/Scheduler/ReadHelper.ih
@@ -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
diff --git a/Scheduler/Scheduler.hh b/Scheduler/Scheduler.hh
index c6b0db8c3..a8cfe59f3 100644
--- a/Scheduler/Scheduler.hh
+++ b/Scheduler/Scheduler.hh
@@ -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"
diff --git a/Scheduler/SignalEvent.hh b/Scheduler/SignalEvent.hh
index a5330f297..cc4e98946 100644
--- a/Scheduler/SignalEvent.hh
+++ b/Scheduler/SignalEvent.hh
@@ -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>
diff --git a/Scheduler/SignalEvent.ih b/Scheduler/SignalEvent.ih
index 96f01cf0c..23ef3e7b6 100644
--- a/Scheduler/SignalEvent.ih
+++ b/Scheduler/SignalEvent.ih
@@ -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"
diff --git a/Scheduler/TimerEvent.hh b/Scheduler/TimerEvent.hh
index acf7f98bf..cb5e17fe6 100644
--- a/Scheduler/TimerEvent.hh
+++ b/Scheduler/TimerEvent.hh
@@ -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>
diff --git a/Scheduler/TimerEvent.ih b/Scheduler/TimerEvent.ih
index 5cda3c0c1..1c5ea524d 100644
--- a/Scheduler/TimerEvent.ih
+++ b/Scheduler/TimerEvent.ih
@@ -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"
diff --git a/Scheduler/WriteHelper.hh b/Scheduler/WriteHelper.hh
index 2280975f2..3b042a7e5 100644
--- a/Scheduler/WriteHelper.hh
+++ b/Scheduler/WriteHelper.hh
@@ -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>
diff --git a/Socket/AddressingPolicy.hh b/Socket/AddressingPolicy.hh
index 6e3280832..bf0ab3a43 100644
--- a/Socket/AddressingPolicy.hh
+++ b/Socket/AddressingPolicy.hh
@@ -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"
diff --git a/Socket/ClientSocketHandle.hh b/Socket/ClientSocketHandle.hh
index 7495a69f5..92635f956 100644
--- a/Socket/ClientSocketHandle.hh
+++ b/Socket/ClientSocketHandle.hh
@@ -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>
diff --git a/Socket/ClientSocketHandle.ih b/Socket/ClientSocketHandle.ih
index 2251a9493..f752e7b9f 100644
--- a/Socket/ClientSocketHandle.ih
+++ b/Socket/ClientSocketHandle.ih
@@ -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"
diff --git a/Socket/CommunicationPolicy.hh b/Socket/CommunicationPolicy.hh
index c589b35cf..47dc01f57 100644
--- a/Socket/CommunicationPolicy.hh
+++ b/Socket/CommunicationPolicy.hh
@@ -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"
diff --git a/Socket/FileHandle.hh b/Socket/FileHandle.hh
index bbbeab1f4..7dbe5ba0a 100644
--- a/Socket/FileHandle.hh
+++ b/Socket/FileHandle.hh
@@ -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
diff --git a/Socket/FileHandle.ih b/Socket/FileHandle.ih
index 84df70c79..b1940c69e 100644
--- a/Socket/FileHandle.ih
+++ b/Socket/FileHandle.ih
@@ -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>
diff --git a/Socket/FramingPolicy.hh b/Socket/FramingPolicy.hh
index f7feec3d5..5359c2710 100644
--- a/Socket/FramingPolicy.hh
+++ b/Socket/FramingPolicy.hh
@@ -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"
diff --git a/Socket/NetdeviceController.hh b/Socket/NetdeviceController.hh
index cabf6a448..56afdac8b 100644
--- a/Socket/NetdeviceController.hh
+++ b/Socket/NetdeviceController.hh
@@ -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>
diff --git a/Socket/ProtocolClientSocketHandle.hh b/Socket/ProtocolClientSocketHandle.hh
index ce8518ee5..835733ec2 100644
--- a/Socket/ProtocolClientSocketHandle.hh
+++ b/Socket/ProtocolClientSocketHandle.hh
@@ -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"
diff --git a/Socket/ProtocolServerSocketHandle.hh b/Socket/ProtocolServerSocketHandle.hh
index bbd97e6cb..a39c760cc 100644
--- a/Socket/ProtocolServerSocketHandle.hh
+++ b/Socket/ProtocolServerSocketHandle.hh
@@ -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"
diff --git a/Socket/ProtocolServerSocketHandle.mpp b/Socket/ProtocolServerSocketHandle.mpp
index 03d83bb63..c17e5ebd9 100644
--- a/Socket/ProtocolServerSocketHandle.mpp
+++ b/Socket/ProtocolServerSocketHandle.mpp
@@ -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
diff --git a/Socket/Protocols/AddressExceptions.hh b/Socket/Protocols/AddressExceptions.hh
index 19c916f80..ea020dec7 100644
--- a/Socket/Protocols/AddressExceptions.hh
+++ b/Socket/Protocols/AddressExceptions.hh
@@ -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"
diff --git a/Socket/Protocols/BSDAddressingPolicy.hh b/Socket/Protocols/BSDAddressingPolicy.hh
index 079a940f8..8ec831c59 100644
--- a/Socket/Protocols/BSDAddressingPolicy.hh
+++ b/Socket/Protocols/BSDAddressingPolicy.hh
@@ -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"
diff --git a/Socket/Protocols/BSDSocketAddress.hh b/Socket/Protocols/BSDSocketAddress.hh
index 1e7d1e773..5afd329d0 100644
--- a/Socket/Protocols/BSDSocketAddress.hh
+++ b/Socket/Protocols/BSDSocketAddress.hh
@@ -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"
diff --git a/Socket/Protocols/BSDSocketProtocol.hh b/Socket/Protocols/BSDSocketProtocol.hh
index fbffeba85..715837f4a 100644
--- a/Socket/Protocols/BSDSocketProtocol.hh
+++ b/Socket/Protocols/BSDSocketProtocol.hh
@@ -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"
diff --git a/Socket/Protocols/DVB/DVB.hh b/Socket/Protocols/DVB/DVB.hh
index 873c4153b..b60d026c9 100644
--- a/Socket/Protocols/DVB/DVB.hh
+++ b/Socket/Protocols/DVB/DVB.hh
@@ -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"
diff --git a/Socket/Protocols/DVB/DVBDemuxHandles.hh b/Socket/Protocols/DVB/DVBDemuxHandles.hh
index aae5d80c0..d1468309b 100644
--- a/Socket/Protocols/DVB/DVBDemuxHandles.hh
+++ b/Socket/Protocols/DVB/DVBDemuxHandles.hh
@@ -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"
diff --git a/Socket/Protocols/DVB/DVBDemuxSocketProtocol.hh b/Socket/Protocols/DVB/DVBDemuxSocketProtocol.hh
index 75450225b..632b5284f 100644
--- a/Socket/Protocols/DVB/DVBDemuxSocketProtocol.hh
+++ b/Socket/Protocols/DVB/DVBDemuxSocketProtocol.hh
@@ -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>
diff --git a/Socket/Protocols/DVB/DVBFrontendHandle.cc b/Socket/Protocols/DVB/DVBFrontendHandle.cc
index d13489eb7..a393eb237 100644
--- a/Socket/Protocols/DVB/DVBFrontendHandle.cc
+++ b/Socket/Protocols/DVB/DVBFrontendHandle.cc
@@ -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;
diff --git a/Socket/Protocols/DVB/DVBFrontendHandle.hh b/Socket/Protocols/DVB/DVBFrontendHandle.hh
index da71b183b..04cc21a17 100644
--- a/Socket/Protocols/DVB/DVBFrontendHandle.hh
+++ b/Socket/Protocols/DVB/DVBFrontendHandle.hh
@@ -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>
diff --git a/Socket/Protocols/DatagramSocketProtocol.hh b/Socket/Protocols/DatagramSocketProtocol.hh
index 236d8ca40..dcf5af830 100644
--- a/Socket/Protocols/DatagramSocketProtocol.hh
+++ b/Socket/Protocols/DatagramSocketProtocol.hh
@@ -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>
diff --git a/Socket/Protocols/INet/ConnectedRawINetSocketHandle.hh b/Socket/Protocols/INet/ConnectedRawINetSocketHandle.hh
index 00c2efe71..0f63559c5 100644
--- a/Socket/Protocols/INet/ConnectedRawINetSocketHandle.hh
+++ b/Socket/Protocols/INet/ConnectedRawINetSocketHandle.hh
@@ -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_*/
diff --git a/Socket/Protocols/INet/ConnectedUDPSocketHandle.hh b/Socket/Protocols/INet/ConnectedUDPSocketHandle.hh
index cfc205ca4..33ec138ed 100644
--- a/Socket/Protocols/INet/ConnectedUDPSocketHandle.hh
+++ b/Socket/Protocols/INet/ConnectedUDPSocketHandle.hh
@@ -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"
diff --git a/Socket/Protocols/INet/INet.hh b/Socket/Protocols/INet/INet.hh
index 18e06bef1..eb03316d6 100644
--- a/Socket/Protocols/INet/INet.hh
+++ b/Socket/Protocols/INet/INet.hh
@@ -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"
diff --git a/Socket/Protocols/INet/INet4Address.hh b/Socket/Protocols/INet/INet4Address.hh
index 0a75b4563..bfea563a4 100644
--- a/Socket/Protocols/INet/INet4Address.hh
+++ b/Socket/Protocols/INet/INet4Address.hh
@@ -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>
diff --git a/Socket/Protocols/INet/INet6Address.hh b/Socket/Protocols/INet/INet6Address.hh
index aa29b2905..94e240df2 100644
--- a/Socket/Protocols/INet/INet6Address.hh
+++ b/Socket/Protocols/INet/INet6Address.hh
@@ -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>
diff --git a/Socket/Protocols/INet/INet6Address.ih b/Socket/Protocols/INet/INet6Address.ih
index 2f4cbe2ed..b1908b4f0 100644
--- a/Socket/Protocols/INet/INet6Address.ih
+++ b/Socket/Protocols/INet/INet6Address.ih
@@ -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
diff --git a/Socket/Protocols/INet/INetAddressing.hh b/Socket/Protocols/INet/INetAddressing.hh
index aeb76bdb7..f9327b524 100644
--- a/Socket/Protocols/INet/INetAddressing.hh
+++ b/Socket/Protocols/INet/INetAddressing.hh
@@ -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>
diff --git a/Socket/Protocols/INet/INetSocketProtocol.hh b/Socket/Protocols/INet/INetSocketProtocol.hh
index b69f5fe34..0d90ef0c7 100644
--- a/Socket/Protocols/INet/INetSocketProtocol.hh
+++ b/Socket/Protocols/INet/INetSocketProtocol.hh
@@ -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"
diff --git a/Socket/Protocols/INet/MulticastSocketProtocol.hh b/Socket/Protocols/INet/MulticastSocketProtocol.hh
index 3dc68384f..173f4fd7c 100644
--- a/Socket/Protocols/INet/MulticastSocketProtocol.hh
+++ b/Socket/Protocols/INet/MulticastSocketProtocol.hh
@@ -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"
diff --git a/Socket/Protocols/INet/RawINetSocketHandle.hh b/Socket/Protocols/INet/RawINetSocketHandle.hh
index 4be6a443c..e0001fae4 100644
--- a/Socket/Protocols/INet/RawINetSocketHandle.hh
+++ b/Socket/Protocols/INet/RawINetSocketHandle.hh
@@ -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_*/
diff --git a/Socket/Protocols/INet/RawINetSocketProtocol.hh b/Socket/Protocols/INet/RawINetSocketProtocol.hh
index abf866bee..c93058a13 100644
--- a/Socket/Protocols/INet/RawINetSocketProtocol.hh
+++ b/Socket/Protocols/INet/RawINetSocketProtocol.hh
@@ -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_*/
diff --git a/Socket/Protocols/INet/TCPSocketHandle.hh b/Socket/Protocols/INet/TCPSocketHandle.hh
index 15aba836c..476afad4b 100644
--- a/Socket/Protocols/INet/TCPSocketHandle.hh
+++ b/Socket/Protocols/INet/TCPSocketHandle.hh
@@ -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"
diff --git a/Socket/Protocols/INet/TCPSocketProtocol.hh b/Socket/Protocols/INet/TCPSocketProtocol.hh
index 232d38ae2..d11578c33 100644
--- a/Socket/Protocols/INet/TCPSocketProtocol.hh
+++ b/Socket/Protocols/INet/TCPSocketProtocol.hh
@@ -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"
diff --git a/Socket/Protocols/INet/UDPSocketHandle.hh b/Socket/Protocols/INet/UDPSocketHandle.hh
index 378511e71..1b0714537 100644
--- a/Socket/Protocols/INet/UDPSocketHandle.hh
+++ b/Socket/Protocols/INet/UDPSocketHandle.hh
@@ -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"
diff --git a/Socket/Protocols/INet/UDPSocketProtocol.hh b/Socket/Protocols/INet/UDPSocketProtocol.hh
index e869e5e4e..680273049 100644
--- a/Socket/Protocols/INet/UDPSocketProtocol.hh
+++ b/Socket/Protocols/INet/UDPSocketProtocol.hh
@@ -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"
diff --git a/Socket/Protocols/Raw/LLAddressing.hh b/Socket/Protocols/Raw/LLAddressing.hh
index 7c9591d1a..78a1c326a 100644
--- a/Socket/Protocols/Raw/LLAddressing.hh
+++ b/Socket/Protocols/Raw/LLAddressing.hh
@@ -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>
diff --git a/Socket/Protocols/Raw/MACAddress.cc b/Socket/Protocols/Raw/MACAddress.cc
index c12b0ed4a..22b0ca995 100644
--- a/Socket/Protocols/Raw/MACAddress.cc
+++ b/Socket/Protocols/Raw/MACAddress.cc
@@ -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();
}
///////////////////////////////////////////////////////////////////////////
diff --git a/Socket/Protocols/Raw/MACAddress.hh b/Socket/Protocols/Raw/MACAddress.hh
index de52a3073..4281efdfa 100644
--- a/Socket/Protocols/Raw/MACAddress.hh
+++ b/Socket/Protocols/Raw/MACAddress.hh
@@ -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>
diff --git a/Socket/Protocols/Raw/MACAddress.test.cc b/Socket/Protocols/Raw/MACAddress.test.cc
index df256c9c9..29a3617c4 100644
--- a/Socket/Protocols/Raw/MACAddress.test.cc
+++ b/Socket/Protocols/Raw/MACAddress.test.cc
@@ -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 );
diff --git a/Socket/Protocols/Raw/PacketSocketHandle.hh b/Socket/Protocols/Raw/PacketSocketHandle.hh
index 51f85c897..3cae497a0 100644
--- a/Socket/Protocols/Raw/PacketSocketHandle.hh
+++ b/Socket/Protocols/Raw/PacketSocketHandle.hh
@@ -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"
diff --git a/Socket/Protocols/Raw/Raw.hh b/Socket/Protocols/Raw/Raw.hh
index 9d5109d23..3a0d06fdb 100644
--- a/Socket/Protocols/Raw/Raw.hh
+++ b/Socket/Protocols/Raw/Raw.hh
@@ -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"
diff --git a/Socket/Protocols/Raw/TunTapSocketHandle.hh b/Socket/Protocols/Raw/TunTapSocketHandle.hh
index 751aef087..5c54ece9f 100644
--- a/Socket/Protocols/Raw/TunTapSocketHandle.hh
+++ b/Socket/Protocols/Raw/TunTapSocketHandle.hh
@@ -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"
diff --git a/Socket/Protocols/UN/ConnectedUNDatagramSocketHandle.hh b/Socket/Protocols/UN/ConnectedUNDatagramSocketHandle.hh
index b25992556..68c80e6c8 100644
--- a/Socket/Protocols/UN/ConnectedUNDatagramSocketHandle.hh
+++ b/Socket/Protocols/UN/ConnectedUNDatagramSocketHandle.hh
@@ -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"
diff --git a/Socket/Protocols/UN/UN.hh b/Socket/Protocols/UN/UN.hh
index 671950087..25c6a9cc4 100644
--- a/Socket/Protocols/UN/UN.hh
+++ b/Socket/Protocols/UN/UN.hh
@@ -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"
diff --git a/Socket/Protocols/UN/UNAddressing.hh b/Socket/Protocols/UN/UNAddressing.hh
index b08b6e35a..eccb8d357 100644
--- a/Socket/Protocols/UN/UNAddressing.hh
+++ b/Socket/Protocols/UN/UNAddressing.hh
@@ -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>
diff --git a/Socket/Protocols/UN/UNDatagramSocketHandle.hh b/Socket/Protocols/UN/UNDatagramSocketHandle.hh
index 4f47dd947..b57996d89 100644
--- a/Socket/Protocols/UN/UNDatagramSocketHandle.hh
+++ b/Socket/Protocols/UN/UNDatagramSocketHandle.hh
@@ -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"
diff --git a/Socket/Protocols/UN/UNSocketProtocol.hh b/Socket/Protocols/UN/UNSocketProtocol.hh
index d7a4699dc..fc56f1be9 100644
--- a/Socket/Protocols/UN/UNSocketProtocol.hh
+++ b/Socket/Protocols/UN/UNSocketProtocol.hh
@@ -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"
diff --git a/Socket/ReadWritePolicy.hh b/Socket/ReadWritePolicy.hh
index 4ddff6727..023b3f664 100644
--- a/Socket/ReadWritePolicy.hh
+++ b/Socket/ReadWritePolicy.hh
@@ -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"
diff --git a/Socket/ServerSocketHandle.hh b/Socket/ServerSocketHandle.hh
index 819fb712e..235b5903e 100644
--- a/Socket/ServerSocketHandle.hh
+++ b/Socket/ServerSocketHandle.hh
@@ -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>
diff --git a/Socket/Socket.hh b/Socket/Socket.hh
index 45f88d647..ca54b3ce5 100644
--- a/Socket/Socket.hh
+++ b/Socket/Socket.hh
@@ -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"
diff --git a/Socket/SocketHandle.hh b/Socket/SocketHandle.hh
index 867d0aad4..9f4149477 100644
--- a/Socket/SocketHandle.hh
+++ b/Socket/SocketHandle.hh
@@ -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
diff --git a/Socket/SocketHandle.ih b/Socket/SocketHandle.ih
index b113145fb..bc974b87d 100644
--- a/Socket/SocketHandle.ih
+++ b/Socket/SocketHandle.ih
@@ -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>
diff --git a/Socket/SocketPolicy.hh b/Socket/SocketPolicy.hh
index 39d358e9b..7d2c059e1 100644
--- a/Socket/SocketPolicy.hh
+++ b/Socket/SocketPolicy.hh
@@ -237,8 +237,8 @@
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
diff --git a/Socket/SocketPolicy.ih b/Socket/SocketPolicy.ih
index 9819f00a3..b3352803e 100644
--- a/Socket/SocketPolicy.ih
+++ b/Socket/SocketPolicy.ih
@@ -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>
diff --git a/Socket/SocketPolicy.test.hh b/Socket/SocketPolicy.test.hh
index 00bf25273..8dd46d108 100644
--- a/Socket/SocketPolicy.test.hh
+++ b/Socket/SocketPolicy.test.hh
@@ -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"
diff --git a/Socket/SocketProtocol.hh b/Socket/SocketProtocol.hh
index 012b857da..759031283 100644
--- a/Socket/SocketProtocol.hh
+++ b/Socket/SocketProtocol.hh
@@ -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>
diff --git a/Socket/SocketProtocol.test.hh b/Socket/SocketProtocol.test.hh
index bdfb5f7cb..497cff16f 100644
--- a/Socket/SocketProtocol.test.hh
+++ b/Socket/SocketProtocol.test.hh
@@ -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"
diff --git a/Utils/Backtrace.hh b/Utils/Backtrace.hh
index 03f47412e..f7f892588 100644
--- a/Utils/Backtrace.hh
+++ b/Utils/Backtrace.hh
@@ -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>
diff --git a/Utils/Buffer.hh b/Utils/Buffer.hh
index c5e92bfdb..45100104b 100644
--- a/Utils/Buffer.hh
+++ b/Utils/Buffer.hh
@@ -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"
diff --git a/Utils/Daemon/Daemon.hh b/Utils/Daemon/Daemon.hh
index f0c45c072..8747182f8 100644
--- a/Utils/Daemon/Daemon.hh
+++ b/Utils/Daemon/Daemon.hh
@@ -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>
diff --git a/Utils/Daemon/Daemon.ih b/Utils/Daemon/Daemon.ih
index f6ec46348..bd29a9b88 100644
--- a/Utils/Daemon/Daemon.ih
+++ b/Utils/Daemon/Daemon.ih
@@ -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>
diff --git a/Utils/Exception.hh b/Utils/Exception.hh
index b151b883d..42e1326fb 100644
--- a/Utils/Exception.hh
+++ b/Utils/Exception.hh
@@ -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>
diff --git a/Utils/IpChecksum.hh b/Utils/IpChecksum.hh
index fa0fcf1d5..a8ea1ff21 100644
--- a/Utils/IpChecksum.hh
+++ b/Utils/IpChecksum.hh
@@ -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>
diff --git a/Utils/IteratorTraits.hh b/Utils/IteratorTraits.hh
index 3d9d62378..bb2fa5a54 100644
--- a/Utils/IteratorTraits.hh
+++ b/Utils/IteratorTraits.hh
@@ -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>
diff --git a/Utils/IteratorTraits.ih b/Utils/IteratorTraits.ih
index 5ed4533cd..20e24764b 100644
--- a/Utils/IteratorTraits.ih
+++ b/Utils/IteratorTraits.ih
@@ -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
diff --git a/Utils/Logger/AreaRegistry.hh b/Utils/Logger/AreaRegistry.hh
index 1ab88e601..386bb2ca8 100644
--- a/Utils/Logger/AreaRegistry.hh
+++ b/Utils/Logger/AreaRegistry.hh
@@ -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>
diff --git a/Utils/Logger/AreaRegistry.ih b/Utils/Logger/AreaRegistry.ih
index 709b51ce6..58709bf45 100644
--- a/Utils/Logger/AreaRegistry.ih
+++ b/Utils/Logger/AreaRegistry.ih
@@ -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>
diff --git a/Utils/Logger/Config.hh b/Utils/Logger/Config.hh
index cd6ccc609..9f0f73541 100644
--- a/Utils/Logger/Config.hh
+++ b/Utils/Logger/Config.hh
@@ -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"
diff --git a/Utils/Logger/Config.ih b/Utils/Logger/Config.ih
index 004368d19..a850fdea4 100644
--- a/Utils/Logger/Config.ih
+++ b/Utils/Logger/Config.ih
@@ -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>
diff --git a/Utils/Logger/ConsoleTarget.hh b/Utils/Logger/ConsoleTarget.hh
index 4b7da17fb..b83b4dd77 100644
--- a/Utils/Logger/ConsoleTarget.hh
+++ b/Utils/Logger/ConsoleTarget.hh
@@ -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"
diff --git a/Utils/Logger/Definitions.hh b/Utils/Logger/Definitions.hh
index db8013fa7..314937bdd 100644
--- a/Utils/Logger/Definitions.hh
+++ b/Utils/Logger/Definitions.hh
@@ -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
diff --git a/Utils/Logger/Definitions.ih b/Utils/Logger/Definitions.ih
index a40ec3f01..b22229389 100644
--- a/Utils/Logger/Definitions.ih
+++ b/Utils/Logger/Definitions.ih
@@ -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
diff --git a/Utils/Logger/FileTarget.hh b/Utils/Logger/FileTarget.hh
index 45f11fd1e..5c4cc3429 100644
--- a/Utils/Logger/FileTarget.hh
+++ b/Utils/Logger/FileTarget.hh
@@ -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>
diff --git a/Utils/Logger/IOStreamTarget.hh b/Utils/Logger/IOStreamTarget.hh
index 05f9eee15..18003c0a9 100644
--- a/Utils/Logger/IOStreamTarget.hh
+++ b/Utils/Logger/IOStreamTarget.hh
@@ -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>
diff --git a/Utils/Logger/Levels.hh b/Utils/Logger/Levels.hh
index f537fce8c..e53af866a 100644
--- a/Utils/Logger/Levels.hh
+++ b/Utils/Logger/Levels.hh
@@ -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
diff --git a/Utils/Logger/Levels.ih b/Utils/Logger/Levels.ih
index 1557db725..92989eb3a 100644
--- a/Utils/Logger/Levels.ih
+++ b/Utils/Logger/Levels.ih
@@ -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
diff --git a/Utils/Logger/Log.hh b/Utils/Logger/Log.hh
index 4faf2f9a7..8a0794c18 100644
--- a/Utils/Logger/Log.hh
+++ b/Utils/Logger/Log.hh
@@ -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>
diff --git a/Utils/Logger/Log.ih b/Utils/Logger/Log.ih
index 4abdad951..0d3f030f8 100644
--- a/Utils/Logger/Log.ih
+++ b/Utils/Logger/Log.ih
@@ -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>
diff --git a/Utils/Logger/Logger.hh b/Utils/Logger/Logger.hh
index 123b2ee27..93fdbba4c 100644
--- a/Utils/Logger/Logger.hh
+++ b/Utils/Logger/Logger.hh
@@ -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"
diff --git a/Utils/Logger/Parameters.hh b/Utils/Logger/Parameters.hh
index 6d8fbed4a..7ecada1aa 100644
--- a/Utils/Logger/Parameters.hh
+++ b/Utils/Logger/Parameters.hh
@@ -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
diff --git a/Utils/Logger/Parameters.ih b/Utils/Logger/Parameters.ih
index 7e21072ab..4941b7919 100644
--- a/Utils/Logger/Parameters.ih
+++ b/Utils/Logger/Parameters.ih
@@ -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>
diff --git a/Utils/Logger/SenfLog.hh b/Utils/Logger/SenfLog.hh
index 8a6c9c1c8..82b9464e2 100644
--- a/Utils/Logger/SenfLog.hh
+++ b/Utils/Logger/SenfLog.hh
@@ -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"
diff --git a/Utils/Logger/StreamRegistry.hh b/Utils/Logger/StreamRegistry.hh
index 63ba124db..c35b69da7 100644
--- a/Utils/Logger/StreamRegistry.hh
+++ b/Utils/Logger/StreamRegistry.hh
@@ -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>
diff --git a/Utils/Logger/StreamRegistry.ih b/Utils/Logger/StreamRegistry.ih
index f6a413844..421655325 100644
--- a/Utils/Logger/StreamRegistry.ih
+++ b/Utils/Logger/StreamRegistry.ih
@@ -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>
diff --git a/Utils/Logger/StringTarget.hh b/Utils/Logger/StringTarget.hh
index ed1652066..a8bc5a222 100644
--- a/Utils/Logger/StringTarget.hh
+++ b/Utils/Logger/StringTarget.hh
@@ -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>
diff --git a/Utils/Logger/SyslogTarget.hh b/Utils/Logger/SyslogTarget.hh
index 18a155948..786b58cf1 100644
--- a/Utils/Logger/SyslogTarget.hh
+++ b/Utils/Logger/SyslogTarget.hh
@@ -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>
diff --git a/Utils/Logger/Target.hh b/Utils/Logger/Target.hh
index ad7e7b227..2190ed5de 100644
--- a/Utils/Logger/Target.hh
+++ b/Utils/Logger/Target.hh
@@ -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>
diff --git a/Utils/Logger/Target.ih b/Utils/Logger/Target.ih
index 01d07281f..c96eb3288 100644
--- a/Utils/Logger/Target.ih
+++ b/Utils/Logger/Target.ih
@@ -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>
diff --git a/Utils/Logger/TimeSource.hh b/Utils/Logger/TimeSource.hh
index ed2c4900a..d6fa2047e 100644
--- a/Utils/Logger/TimeSource.hh
+++ b/Utils/Logger/TimeSource.hh
@@ -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>
diff --git a/Utils/Logger/TimeSource.ih b/Utils/Logger/TimeSource.ih
index c0ab54f10..9d02972e2 100644
--- a/Utils/Logger/TimeSource.ih
+++ b/Utils/Logger/TimeSource.ih
@@ -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>
diff --git a/Utils/Logger/main.test.hh b/Utils/Logger/main.test.hh
index 1d209236f..aafc4df60 100644
--- a/Utils/Logger/main.test.hh
+++ b/Utils/Logger/main.test.hh
@@ -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
diff --git a/Utils/Phoenix.hh b/Utils/Phoenix.hh
index 5e0436215..773bc5a04 100644
--- a/Utils/Phoenix.hh
+++ b/Utils/Phoenix.hh
@@ -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>
diff --git a/Utils/Phoenix.ih b/Utils/Phoenix.ih
index 485bbc480..fb548e525 100644
--- a/Utils/Phoenix.ih
+++ b/Utils/Phoenix.ih
@@ -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
diff --git a/Utils/Range.hh b/Utils/Range.hh
index db6d63eb8..f9da32262 100644
--- a/Utils/Range.hh
+++ b/Utils/Range.hh
@@ -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>
diff --git a/Utils/String.hh b/Utils/String.hh
index 1bdf93ebc..10f523e67 100644
--- a/Utils/String.hh
+++ b/Utils/String.hh
@@ -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>
diff --git a/Utils/Tags.hh b/Utils/Tags.hh
index 9328c0d72..ff9f374bb 100644
--- a/Utils/Tags.hh
+++ b/Utils/Tags.hh
@@ -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
diff --git a/Utils/TypeIdValue.hh b/Utils/TypeIdValue.hh
index 0e8d3377a..85eebf03d 100644
--- a/Utils/TypeIdValue.hh
+++ b/Utils/TypeIdValue.hh
@@ -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>
diff --git a/Utils/TypeInfo.hh b/Utils/TypeInfo.hh
index ef4b7200b..e5e6998de 100644
--- a/Utils/TypeInfo.hh
+++ b/Utils/TypeInfo.hh
@@ -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>
diff --git a/Utils/auto_unit_test.hh b/Utils/auto_unit_test.hh
index 402dd63fd..95980e3a2 100644
--- a/Utils/auto_unit_test.hh
+++ b/Utils/auto_unit_test.hh
@@ -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>
diff --git a/Utils/hexdump.hh b/Utils/hexdump.hh
index 4cd506289..f5a60e681 100644
--- a/Utils/hexdump.hh
+++ b/Utils/hexdump.hh
@@ -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>
diff --git a/Utils/hexdump.ih b/Utils/hexdump.ih
index 2c530a840..c03f51b83 100644
--- a/Utils/hexdump.ih
+++ b/Utils/hexdump.ih
@@ -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>
diff --git a/Utils/intrusive_refcount.hh b/Utils/intrusive_refcount.hh
index b3bfd56c2..d3b980f35 100644
--- a/Utils/intrusive_refcount.hh
+++ b/Utils/intrusive_refcount.hh
@@ -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>
diff --git a/Utils/membind.hh b/Utils/membind.hh
index 6b06ed35b..742930711 100644
--- a/Utils/membind.hh
+++ b/Utils/membind.hh
@@ -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>
diff --git a/Utils/mpl.hh b/Utils/mpl.hh
index f33ca7ebf..fb1b5664c 100644
--- a/Utils/mpl.hh
+++ b/Utils/mpl.hh
@@ -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"
diff --git a/Utils/mpl.ih b/Utils/mpl.ih
index d3de41872..060b94b89 100644
--- a/Utils/mpl.ih
+++ b/Utils/mpl.ih
@@ -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
diff --git a/Utils/parameter.hh b/Utils/parameter.hh
index 7ea462c7b..37287fbe6 100644
--- a/Utils/parameter.hh
+++ b/Utils/parameter.hh
@@ -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>
diff --git a/Utils/pool_alloc_mixin.hh b/Utils/pool_alloc_mixin.hh
index 5fab5f6c5..2cdfe5ed1 100644
--- a/Utils/pool_alloc_mixin.hh
+++ b/Utils/pool_alloc_mixin.hh
@@ -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>
diff --git a/Utils/preprocessor.hh b/Utils/preprocessor.hh
index 0567d781e..915f9be2c 100644
--- a/Utils/preprocessor.hh
+++ b/Utils/preprocessor.hh
@@ -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>
diff --git a/Utils/range.hh b/Utils/range.hh
index 9d4109b53..d7accb27e 100644
--- a/Utils/range.hh
+++ b/Utils/range.hh
@@ -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
diff --git a/Utils/safe_bool.hh b/Utils/safe_bool.hh
index e8cff228a..44c18616b 100644
--- a/Utils/safe_bool.hh
+++ b/Utils/safe_bool.hh
@@ -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
diff --git a/Utils/senfassert.hh b/Utils/senfassert.hh
index 245bca970..caa515a94 100644
--- a/Utils/senfassert.hh
+++ b/Utils/senfassert.hh
@@ -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"
diff --git a/Utils/signalnames.hh b/Utils/signalnames.hh
index ecfbe4eee..b5b8f34ae 100644
--- a/Utils/signalnames.hh
+++ b/Utils/signalnames.hh
@@ -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>
diff --git a/Utils/singleton.hh b/Utils/singleton.hh
index dce43c0e1..b7b2814ac 100644
--- a/Utils/singleton.hh
+++ b/Utils/singleton.hh
@@ -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>
diff --git a/Utils/type_traits.hh b/Utils/type_traits.hh
index 1e9667b40..dd9ddb234 100644
--- a/Utils/type_traits.hh
+++ b/Utils/type_traits.hh
@@ -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>
diff --git a/project.el b/project.el
index 721139569..85fac8b8d 100644
--- a/project.el
+++ b/project.el
@@ -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)))
--
GitLab