diff --git a/Examples/MultiMCLoop/MultiMCLoop.cc b/Examples/MultiMCLoop/MultiMCLoop.cc
index e5981340dd00bb28900bd31c6a2ff7cb6a3f80cf..cba9bb92d7145443b5838974bf04482c59d1930f 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 14d25bda50f71b37093e11d7a88f228eaf1178b1..141bfdacfd706b2dcde03b8bdfa9aa1a007d3f36 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 494f1eadca020713ae82274ff074cd2033349627..cc2ffc16f89c3b18df568d994bf2f1b181838eb8 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 6b98b155e5e5d24850b7728b04b52389ffe464ba..a186fd5eb5766cc3e008ff3fcddfab304738173f 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 6dd80004678bf1eeb596a6215110949678c81393..3c767c9b2d1d58d9ff9e6b2aba7c1b0b013c39de 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 e5ea9c91cf064241613ee072a6a963e0d7edf69d..07316b6273f52951b08183b802feee486fc49651 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 d2a8e4c0b1592c966434acde47ce1021bb636cd2..1a40cebf05bd41e430a1cbbd10fcc9dc8557ace1 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 9215d26a79b05dd8a177696525cbe1a2acec99a2..12268f646e105bb81faa1da898e1d116e1039bca 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 85e51eb6b260201e64e15a6d90241a2b36d4025d..b82644793249db92b767afcae6d6a1136977da38 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 39a16dd7043984bd01fd8887d57dd85ada485a5a..3bce6ec70ea22c52b83c5419811835f56acaff84 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 d6de856f7483c4a58b6c399c889349ae68c08858..20535a03649f687184c445ff3f2d19175404fc1b 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 b3717bdc13b9c4c4f704ee6d6fc9f1376f367722..3f2fc25b25bc694456b14ee0af70c02be97152d4 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 a2354c869c207448e6211e8ef81e1e6fe019ddc7..8ce96161ce3930164add19450c5a96b81d06e3ce 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 2b2fa71da86636d9bffad367662528b5f15fbbaf..20649bff8855b9272101c4cacad37fb4761aaaf0 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 d9d771db855a9486279a3f4f7eb08e22008faabd..7b3bf481885fe9f9248abd8c1611932c5695ced6 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 51656ea31ebbb80ac520bb1a40f670d877ca5a2b..128dcba8a34524bf8cd430047b69e83b269b5d60 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 1763f35468077fce8f46a53b0032d238bcb58de2..98228e47e5af0c9dce7c771f2f860806109efd35 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 77cb333b86a238653230e5c6a79e6c822a2833dd..266e80740975b2e1ecb22616f2cf6efaffddd3f2 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 c2faf562ab03ee662321de8e6ff0cda07cc57c50..97f1c11c6fcdb50fed9d59936e5d47b436629bee 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 05382639e6388eed3492e301828fb8034fec084b..9d208128caa0cf53cb3b84f6bdf1e02a60041b65 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 76ba447da4505521b4c3e054eaf337e19ed0d87c..14ad1a925bfad3c54b497a25432ccc2a5e1e9c01 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 536a22ee456ff234f0e3f995a8d55bb1f299376b..c252245c098a00ecdf057c20cf66df13b1528448 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 2412c4aca4e81c8a8fb8a9afbd518a96c7114408..12cb25add4ab604cbcecf13821a41951622a7191 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 16cecb4a5e5d2d04ffc211576e8eebefb4b39273..5ed6a9ff855923dd86603f152b306220350933b0 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 58f330be6ecc41cbf1aa0fc2520c7689f352d8a8..bd681701ad632cbe9e053e580f9a8b681dda2205 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 fa59c96791fb6f0a8d7c7a5acfe633e7d616a089..fb2930597f6d1f3d5a97950067d8c2c684aa5c22 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 76125e3ba05268794d1de9ca4ad1125ad1ee035c..31a4e5b31f8e7785126ace7fc9106633c7b965e2 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 021d52894e50a7ff281ca7f1a161b6faa7b17e93..9a06fa4e2a1be5cb3541add1f7eea9602e97202f 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 f7f61a55d855cadce6e938ca2d39ee61eded5eb5..a5c384b2300b78b476f00410ca84f79105d72388 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 a74fdbcad31010738320ef2cf37622bcc37f8b79..49c863ff45e7c902b0ab3dfb7ef78908243fee3d 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 a58935e7a02dd5af1e343ecce22e5892e98eabb1..4addc8392085ddf3e4d2a92c073d5c45c2e06fc0 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 f5b3cff9fc0e48273e54157b2f7f22a142a1e235..edecc0b86d1bdbf2c69783561ddc7c8aed15168c 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 93089dec1c3c065f253f3a98128ec1471af149aa..f4898797c880a10dbd93149ee70d7f517e32f39c 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 703007249329ba9c85e9dcc830d4bf2e8f983d5e..ef6e17b72b48ff888e4e87137f3c41cdef0eae0a 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 ffe2cb0a8bff7bb1730887dc29c60339829b75bd..0c113371b30bff1c6cf527b931ea281a532ed14e 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 2dec0cc486112399b17e41b0bbde06679f6588b2..bb97cef40a87ec61ebf19e6f661baa30995c51be 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 fdf47c84add4bdafa187401bea3e7fcefa148a9e..c76926c4b644695118e09c277bba888c0885ac26 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 ae2b39e753d30761bc5b8a98a4cbf959419b9026..fc8cd048f9a6a304cc9ce02631a5b43e9dfd76e4 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 aadcddeac08fc04c3c74182a6c0f05e18376b256..bac25549d60345e9e30f995a2cf1595d7b3ef6b1 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 496c9b8e4aa7cfcf50b4993684669328d072aaf0..c1e367b181db29450684d4e68f100be6c4ad1354 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 d40510aed2d53f5c9a0a19e31e79868dbd77df2a..91ac6104a51dcd1412df4dbff8e3b432389cbe30 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 400691854f2ae440b16f07b3ef9fc2e2471458b0..63815d83503ddedae7ccfcf1a8a1a390f8e2c3f4 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 d7d05b81e184517632f9d25feb7daea438ab0e9a..037b61fcf114268f26165b1f9633f086d5f8db41 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 cd17bc351b60ed239936368dec1635ac9a080c07..5a2785d0cdd95fdf9d2dccb45629ae5c0a7646f3 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 dc82ea2ffa2acd0317f435f80cd29fabc0cb5118..8b1aa70f996a2a5e6ff357917838c2baa025f4a4 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 eb51170b63a3b6084f248fba8c6b88bef08e15ef..4b4a985f56f5cd71e37c9b8a4ef76ab6597daa5a 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 fdc7b85632d0c84173f3221e670c3f273207823d..d496b73e325ab381ece924de0df50e24d6ab5e13 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 7b66813ed51a75e02f06bdb0ef8ad9bb87791a9e..76227c0b5f58cfc6c93d0dcb612365ce05510004 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 2396e1d6668c9d4eb9cb929e5ba396b85d2e2704..fe61177aeef3954143709ccb083a1316f4e78701 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 2d96b566e017c83cde1b4328f19f763593bc8438..8ee812457e6718f9adb028d1b1d4ace302056e38 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 2931359f6fa2520d59b29ce3455904a077ad8a81..db54348d82a5a60db38c33af205223ffcd999ab7 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 0382caa4a5f5d7d6c40d209bb74ead330b07d909..004e77f021962974e9becb09c0b7d057e71a253d 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 f756410b0e15c2636d529def0b629110f22f5dc2..0be4b029aeb34f1c7c61df62d4dc4cb3a060b5c6 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 128cac0ea5f3c26b9945eb2dac708d95e2fe346c..d3a8e05d1ae281b557c9f35815884fb315ef744a 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 702f546d021b3c4ca17df671d3cc3f8b6c64c2b1..7b7879db38471fd6339632de3ac1be30fabe4a07 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 fbbd16bbb19d5f0f88edfbd33f03b19296eeea20..4f296acf2fa3f792f19ad8749eebc4c4d9907851 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 492507519b5de73664853abd51aa4414f0c0e256..f033a4d4669f0cc3c243dc91cc3f9df5faa6c284 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 5ff4889bddc1061d91cae0794010fa25d1378352..ae1f540b88fce197c025826856622382d23d5314 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 ac77eedd960592819d9eaf2ab6af386c53809a19..3d51f78ba4492c0ec2d580f871e1c5e5b0a755c8 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 d63e01ad8cb18ee2cc9f3465b063b2215e560691..77602004a1cfe6be6e57510c9e619aa992b12145 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 667eebb151ec9e237711d89891ac433b4b6109a9..1933949a3a9c06692e6544464c7c08e6db0c2b09 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 790c600cd24c980f18db3138a686a25f2ab23621..66fc03f8eeac87d33bd4c0e4ac6e570121440393 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 59124e3c87d0b1954aa01fb6a9fb4dc1f8ee9af2..8c218e06bb347e236034e959d69eaff8675a2ffd 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 4596ea8e35c106f963fcb5ae37c9aea924bef767..00df8a80270fda5969c1a0f9928d1f98114eeca1 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 a17449cb99cff29f7fd07cb8fe5743384f91024d..1fa7d99f8b161dc408d2d184762050a29470a3f8 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 32139e716fbfb3cb15a94515e6067bcb3ccad84e..af16278686f7eaa4c79eab77ba88513878d1eb50 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 a5b671df261d1fbb6d868718e976345d8a2f267f..e97380b5f85f02da3e80730f6e1db2a20af8b16d 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 3cf7a9c5d06d364c620ce7e58c9a70244ae9935f..fe229a64ddba455823c8cd6023ba443344374cb6 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 90036c0026c9c9f0c702ab6021556d53c657bd68..ea0e3182cacc643aecfb3cd9539cd61fa96ed346 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 a8d5fbda1ed7671f56b94f9f201c47332bbdc29e..ef5ec450b39e8f2b9c636efca43691d1332ebe01 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 cdf8f7447099989448bedd56947c5c2d6789c544..6392b693ef5ed87f5022850d016f2d4cbd29606b 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 f845b7885c58259d8f9a51be01579b8a65e9f8d7..a798945f69846c40c41f2a26d534085c1bc468cc 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 44982a71991e38b616ec2b215549e2ea7d1121a0..b0ff4bfbcaab3ddc828596d0ea39051619181a5f 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 bae313928d306a3e015bb5f65b7d69356722a7bd..b0ba3e819d0cb5b156065e67dbca06d76ff5bc08 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 a76900e981f88540474a1de21b369dbd0d5c5e4f..17b0ca414445dfeaebcbb89ead5bde5424f04799 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 275cff1fe8094f05facf6cc69188606efd0500d8..d667f860857d5448d4f51f4350002749d4852f2a 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 2ea65d49287c8ec7d674e3b91d1a5fdebb54f880..1bf32545addd661e3449c3a6ce8f7963b437da25 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 b1254dbf291b23b10d149e60cccdb4048605824d..34b2c2921f0478d0f3156e1fe8cd3d3e3f5b96dd 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 6f82bc02c36d5a82b58c905aa8cd400f02aff1f1..bd46aa1161c1cfaa2834f417ae6d512dee6a2bb7 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 b3a744ce4b89413c977152117e563d81e47cf5d5..ecd472cf268a35f5ededd8b618c3d321e9e6ce3f 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 bad8b6e2ec20824c19ae33131c8c22235281000a..02082ea057fcd0514a17854c7134eced102b9d26 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 f5804b799baeea49006b28a8cacd224dc9698147..4ef6fb0c09b4db74b058730e6c74e9ad8e6e7e6a 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 208abb22fa5972a5ad42c2e0b03e28fdeb3ea08e..bb0e55ecdf86aec21f43ae058e021c1d35f5264a 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 8b5a291072d682a3c1797d253189e5d3ba9b8ed7..15414fbed8ee9154641147ef41c6c5384ddde1af 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 59df5a9b5042121589c890940a73a222ca12bce1..80191d01596f213cd5e24b58a1a10f78ece13e58 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 66892a324b9b0f01e8e9588cb6c6ddfc646a660e..c75f9955542d48af15ca095e63374c0824a83935 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 1f27f48ef04d8a14bfd46357e4bcfad5b2db2950..7538eff228fd9e68e788bd73515396149323c351 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 041bc425f25a9ddf22eaee770b9b98546ccf3939..38f0f0db0182ec8fa5cc1faabdf2ab7e5e92bbec 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 05a4e920e5e391fa60a8384f47490f2ebcc68cdc..8c4b66842f58078e43dd7496b8f06334417f72de 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 1a02bdd55be840eb3887a27aa37717736f15b276..421d744c2d867f923405e3a43b6ee7b6023199ef 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 c39ff519ab32c1683861feb48f986271a7c39ba3..ee9bde99f8e48381f11eb9773666e50e188a5f79 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 59b0a3b37dfe90fe2fd918f77d86941aa6e06504..cfa871be5c0c6de62f1002099d108a848bdcaf6e 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 61c5cee47f73846c48b06775120dc06f834b56dc..afb4b78c2d9e29bfa728d3ebc3413c4caee46739 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 6604dd34875277024ef9b873655ae40d2fb65813..4de6952de2d00cd9bad6986d7bb73e8249d1b05f 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 c339445209f920d6cc51da7e1bfaf11bfd1bf257..0e2202165f73c67095cf709bd656af1ba8a469cf 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 d8f819ec033ef0e66ecd20a37910125fac4e7a1d..2f985f3494952f3bee2703efb6948a0619c6f8d3 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 d99d899f9dc73794e7cc7ffbc823190008b389e9..7bbbf0cc3131b935e1b6573227bfacdb9fda2d5e 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 3daf4900581ce8c6063064a650d9be682df57f09..2b6a67215899dbf35238a00c41a85044e4ddd9a3 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 f82375affb4a5cfcf6fc20c127c237d0e06a6640..512386e371a71ae9a72eab5f2885985f352b43f1 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 7ccf2840986cf8cf7bcb79f2c43712e7b293f65e..dfd0cf312178b01554c7adcbfa93c2778eac4e45 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 332512a196d2fe33fe8bd2ae82686c936cef0705..9db9d4cee6aeb4786a86b43e14acef748f10090b 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 06fb0863c544e74f9c063cae61aeb9c995bad20e..fca5601787c3ce3b8e6bf231f918a4affe3631d8 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 56ab1fcc707e92d62b14c5da005d366f77a7c52d..3e895341c2278d07f1dc958f39249ec3ecc89a76 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 900b2b18d806b7be775682eefd888a4ee1586971..d479f45b71926758b57010db32282e37a89e4033 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 7d97e70762f13524b750e7f83c696c400f40ebbc..b9f3b1ba7f72eacd0f26cd540452fa1d8d696523 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 d8a9468019d83344b0bf1d455a4d6bc85766d342..2ce1dd267bb71e85b8983b864a3963d663fd54bd 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 3772fd0c7ae9033d4b27268146ba0870b5ddde05..0f703aa0ae79d8f404404c9621eda3ca5db60148 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 d59414fc666c36a3fe331f46bd8cfcd917ae5a70..44377803529232c9af57b1c06f59b7cd964ddaf6 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 e526bce74e4994a5a67462c5d021925a529147f7..2bed1bb5f72f1643b77ebaf198f04e99ca0eba4a 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 f08f0191c4763aebb7b69a54d27d48e0abe1b8e9..3c156fea544f77687b12eb0b87d462a925843916 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 8803f7590957a7321cf128fde522243155be8fa8..11ab3ee737e24365a30114fb54929da2f43de862 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 e3500ca14176ccc9a49658d4855c9cb6653ef987..afe10c7ef3bd2a1997c1466e44318a3e950fe1f3 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 9404a5c2160cfc1467c238aa1dceb22ea72f29b4..9efe73721451336fadf8ea2983a1e12efb85774b 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 317a4eb07c6354241eac5895edaaa2ee22ccb2b1..ff752bc91e938a60b4d457f163e8f9cb7cacf48e 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 6080d0d5ccfd11bd1bebc74f6e2de6cb2f6ab11f..1c058780b97ce811141c0634b745e67a75d85f4c 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 bcb98a9f3f8e50e65cd222dc7b9320bfd39dba4c..940a05794c9995fa42706de9254dd2a1f71d01ff 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 f43203244b0b8eea5949fca0ded8531381e3de50..bf5442023c1acd6113014b6c1c2cbf892105fc07 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 68f96fe4a0bd65e4995fcc16ae8d2639e192d49d..bc299534ebe0a6e6859429d118277a65b3bb1cfb 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 85965e57b61ea0d4967c27bd530b0b18247b3fbe..011b51a370f95d8ae580741269c8068796baf284 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 619574b5489322b088e63773318b635785088e54..19ffa1776e48b1eed63e05ff13364a9b4fe9574f 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 c6b0db8c30132b096be01a2fea31b5b402047e57..a8cfe59f3629b6e50190aef537a218d4e3e00a25 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 a5330f297c9cb23fff01a9ba2ca61ba7aa7dd22b..cc4e98946afb438c7d2265448c9d0f249bc1aa0f 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 96f01cf0c9cf04d87e610da5aada43cc8a6a9873..23ef3e7b60d152b400095c6e9cdbcf42d08f90b4 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 acf7f98bf6cddbf46fcb7db3bcf90682d22621e6..cb5e17fe64a16f6fad504c1c6c4287a6f55a8415 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 5cda3c0c1db309113bacb5bd6930ea2a0f0890f6..1c5ea524da73b59b3ff0fee75deacf7c30051f74 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 2280975f2849aebcbf43716240937854ee1b370a..3b042a7e50f6a87568dd991a9c380df8968be573 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 6e32808321aa20f36dae88a3a5ec064ab33a40b6..bf0ab3a43b4dbf831ff7f7fa26a7ee4cf0cbaecc 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 7495a69f5148696d20c161cabe9e77c54c6f24db..92635f956927c221c820ce60de7bc32402d7d64d 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 2251a9493a5c235440423ce636e20e30da6ca03a..f752e7b9fa518593ac83ddd6bb2b67e072b4e653 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 c589b35cfec346e2096d480c28d7fa6219abc0cb..47dc01f57943efd0c259d0681a7292002910baf7 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 bbbeab1f418be17e955175effd4668dd088b0f47..7dbe5ba0a908137579c752ae7b92d6d1eda321c0 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 84df70c79e1dcf072524ce15bbd29d5dd2887ac2..b1940c69e34c9896db4027cf218511b24e5eab18 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 f7feec3d5524476ac7da72170c3a412d5fc4dce0..5359c2710e5496e9fa918e2748202ca48473fc90 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 cabf6a448743dc2530676cf2afff0053965fec23..56afdac8b07d57e1de810b3804ad550ef4a618f8 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 ce8518ee5c8c163827a8b89ea8fa052247ae5209..835733ec2dd4a6f1027e1fbe76e9e18e4401c586 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 bbd97e6cba996fe52729c00f0cb3bf61038cff20..a39c760cc4370112dfd2f6ae123e003fc7d6d7fe 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 03d83bb630db58433e96a04ac2a229e78a10ef0f..c17e5ebd9fd1daa432746d493d420a081b278abe 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 19c916f801f2d28ce9c59aa9cf4762636272bd2d..ea020dec7d8e2c726b920b30677f19958f47529e 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 079a940f800e4cef624b7ed735d5fee513d4f9bb..8ec831c5982525bf344f0beeffbfd6c5a8896ab8 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 1e7d1e7737983cd81094594714a4de92d46ff578..5afd329d0d047a4601755ea232c74eec0be4b1a7 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 fbffeba855e5254fe03d8b9d0f0492ffa5264a94..715837f4a26b72d80ec42bcb6812c0725b1ef4a8 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 873c4153b4fe1c6a6488973eb243716d543525ed..b60d026c91b6954320c84f168c34a780e87a399e 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 aae5d80c0b589c96f23648637ef9bf50342b76b2..d1468309bcb95ed0efba98d81adcfff6d4086ebd 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 75450225b3789ed3dd542e7ca3357a8aa70ef1aa..632b5284ff543dbb483156c984c6bce47cd88ce2 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 d13489eb7077e21b041eec124cec2024adcf8b90..a393eb237415d572fc452fabce531d42cae863f6 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 da71b183b1731f1ac124c4203ec0880e143d9cb9..04cc21a17339eabf3d635a1b6ade2e1931dd7d51 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 236d8ca4001d43cf00e7e86740f0cb6c1065d7c8..dcf5af830123687df23b8657fbb7ba2c772be448 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 00c2efe717017ee708b8d60d4ec044b4c0eacf48..0f63559c57a267f37cd3cd6a32f6aace69979f89 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 cfc205ca472c7b173d7933b145c07195151bc8e6..33ec138ed52a5e1566d54d800b0208150348c3a1 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 18e06bef1437ea7990af98b02303c43b0a02b734..eb03316d696d0ebdcc5558d7c8b76f17003d4173 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 0a75b45633f5a737bb1883265cd423a392d99999..bfea563a4460eb3072d6033840bade263e28e3b9 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 aa29b29052988ee737cda5d3e0d4a3384a4a05b6..94e240df2215393adcd4c9c8955b5ee22eb518c0 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 2f4cbe2edaa2dec31a080c2b43592d2fa2ccb930..b1908b4f0fc8daef59f4f775ea78858840d89bcc 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 aeb76bdb7a046bae9973162d6d7046c316471464..f9327b524e2d728081d5e93e877dea01f965782e 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 b69f5fe34db5e2f1caf682a890191c5bb4c7d0cd..0d90ef0c7d1daa1ae668b62a97c4b8c766b2bdd8 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 3dc68384ff396054f5fdf1718b54f9fc43fd45d0..173f4fd7ca622671dbbd65745211c7e29bd97990 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 4be6a443cdcb6ca60ce2252cced32d44b83bb8b0..e0001fae4b320b05ff80aa57d3b19bbc8e0df5f3 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 abf866bee5c5bcdfffab6a240f172959381b47b6..c93058a13e8efd945ca3e80be93a2f5241f52eef 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 15aba836c8a7d82b32eccb836d8215176e59f24d..476afad4b423891a370ab21337837f9acd7d22e9 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 232d38ae236015562acebcc03f3bda14968134e7..d11578c336be2b3fb3f88202228d7f1cbdcbcc87 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 378511e71ae76a91c70af9e27c92703c232739ba..1b0714537e16f98937fd0e68fc2bb8f64e7e28ef 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 e869e5e4e47e2fe91728b1c051beb5463d5534f0..680273049ae88737a088ada85a71d1fe7cf54427 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 7c9591d1a29df8256fa410e9b216af42e6856e13..78a1c326a421e9208c47a65db0bfebc4137fab7d 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 c12b0ed4aaa3c324837b74c392c6d4daf01d016f..22b0ca995a123e48d6c0c7117d0e70643c895888 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 de52a30736a0224d4ac91a973853640f65709d0d..4281efdfa62d12e73833a14974b8d7f85fdf8e2f 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 df256c9c97fa887fbc035ed7735e8e93909803a2..29a3617c42d22879b63628c1208d10962a37151f 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 51f85c897f0acf33a7331120fb38f4ad51284540..3cae497a0751a2becfe29adca32ef2406a03cd9a 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 9d5109d236ee08d73aab7a723fc2344d8c007fc7..3a0d06fdbd2e0654db1d3ef272fc370d93404da2 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 751aef0876ebdd19338d86f07432386f312c673b..5c54ece9f5e112749e23cbdacf7b5feed8329b34 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 b25992556bfda67526c3eb7247dae955bca4da43..68c80e6c8b4e381b5edda2b7c282606c5153a279 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 671950087080503228625c4461a769ab886f25c1..25c6a9cc4ab2b93f9a73fbf79aba4f46829f2195 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 b08b6e35ad4d0a39cc400be255e1007ca0641f18..eccb8d3578d9dd71c04cd5cb60896093bee1949e 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 4f47dd947d1f5a1ac7a8ce0cdc6e0015c68885c6..b57996d89d4a1f5724a1e70aed359d34b5d132c3 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 d7a4699dc0b45f673d41251bfc26652d2ed7a5d5..fc56f1be9521d99dbc95b7d13b4a7058f8b8a064 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 4ddff6727802169cf1b9677f907b8df56896d7fb..023b3f66476b80ed156da6190c8bcff0421d91ca 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 819fb712e9fcde630cb0d85b96840bd9b3328951..235b5903e3484c414d82d21d2a006ebfb0c052b1 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 45f88d64702d455dfe96b2d294189e3d79fb3c6c..ca54b3ce57120498fe0b7af955005f95a86c3a52 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 867d0aad421708dbbdadd42adf0e007d4a2a95a1..9f41494779da8b9480eb40ee2e49289806981c57 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 b113145fb4fe1c51aa1e41455bfdb0497087f3a0..bc974b87d8fee9ba6b6e92d10173e18c6d717c1f 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 39d358e9b45c170ae5bbf5aa9a79243dcfa992ec..7d2c059e1e3c4341741351b43bc98ed725837fb0 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 9819f00a3965993401c18e60f18881b043a4c212..b3352803e34788b596f86ff284e94a198c986e8f 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 00bf25273cb84da046b6a4c276f49f1df2aeedeb..8dd46d1086582a8eae1c8704889ecb27ac4f291b 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 012b857da9b1e045b1f046a1ecbe0fca16f08087..759031283fb5871dfcc206bbd9a12d81909e7efc 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 bdfb5f7cb2e90ea6f4dabdbe1842ec33c29959e5..497cff16ff99d020a4849b746243383781286abe 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 03f47412e40e7e834670b2624a35f8b385170425..f7f8925886b7b630e28e426ee0017688acb45625 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 c5e92bfdbf78e1ffb2ff0d9701c63ebe057ed3c5..45100104b7690b880a79b5fd08a4fb57c7fe7942 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 f0c45c07212a081d9eb478023997a05b52d3bbec..8747182f83cda8be099457463bdae93e780f44d8 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 f6ec463483867c861d9163291811562eb90a2b15..bd29a9b88bf17ec0e310c49a1b1a8d299fcac333 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 b151b883d54c15e760501d69e3a613fa63b56f9e..42e1326fbca957754412da8b56985c5f48eb9953 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 fa0fcf1d5d4d538254230f34e047cedba887560d..a8ea1ff2129efb7b599e55acc23d27f58fd530c1 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 3d9d623780584d826a9d0db3381db582e168f954..bb2fa5a54c9b7b27da23962ef979fec8efd83836 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 5ed4533cd9b77f6f9bd1db3b14cf9e8ccc676b1e..20e24764b413f550e7a88e8b850bd614c707e993 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 1ab88e601a2213db374d323fff4668a193fb7232..386bb2ca8037664aa68cf9e35384b89f1a32e8e8 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 709b51ce6461f61f7e0ab324081458b3c43564db..58709bf450eaa0b62c1044b56cf3d946b296aa2e 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 cd6ccc6099e9996a75cdfb7933494a8814382364..9f0f73541b202cc46897aad2b559ff02446f098c 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 004368d19e873c91b81d9f3e58e48fec376ab4d3..a850fdea4f848de373e15ba193ffde9078736130 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 4b7da17fbe66589ec151f7b8808bb060fc1eaef6..b83b4dd7744aae5d4b1224327851bf9966355ec2 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 db8013fa7d5c4d5f7ec90990fb322da684189ec5..314937bdd0e62d87b7cf73b8f55d96d44f7880a8 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 a40ec3f01c12121b6f18f9fb88700c4f5f140ab0..b22229389adfde109aafe5edf9f5717c1f23727b 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 45f11fd1e0c458bceeacaefb0bcf323d035cd9a4..5c4cc342944896ea34ca9f75bf46c4b0f9b3bc8a 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 05f9eee1564abc00068a07fa551df87f3f857233..18003c0a9d6fc3717632ed07f870de00598e86bf 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 f537fce8cb5e4b85abb2559ef7dfbf194dfc0cd2..e53af866ac7fcc4190f3bbde66fb76a3289e9913 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 1557db7257b8d2bfb8fe972ea9a923862b1e973f..92989eb3a6d8fca6846881fb04a9a3f25a761629 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 4faf2f9a7e5989ebfd9a8ce0d8bcdef2a47b01f9..8a0794c18e02c81b739f33736229f6f6368365af 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 4abdad951997a9ae66a73bc20e4f8a3df85dfb76..0d3f030f8e91a467fbc19ffa66e2386628c5704b 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 123b2ee27d3326c167156d29fb680b3a8aba591b..93fdbba4c9c0026504b24f49eb101d10c0ad2adc 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 6d8fbed4a39616852162a4f1587e82e9d4b4d0b0..7ecada1aa46a985d7fdacabeaad1713ae67ebcb9 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 7e21072abf431a4fff8464274b658773f4865227..4941b79191b0975546570f9a73beb989dfa8de3b 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 8a6c9c1c8585a34ed3bec119667078679b67a60c..82b9464e266ec4179dbefe3ccb3be4ff9b1c1bcd 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 63ba124dbc768adfec7098648719991a027e085e..c35b69da708a13512cf1bf382a48801999b219dd 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 f6a4138445e3a9a95dd69f42b4ddab8b0b232af2..421655325af0a9e916ba568da60e0e99865e9ba5 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 ed16520660a4f47a9920eaad592234127a47b12b..a8bc5a222ae6d79528b311554f4d55392a4dee85 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 18a1559489f037c74dc37930754a593c1c4e88cd..786b58cf1b2b72eb33edf70554ecd33e9fd03863 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 ad7e7b227689b4ff964e10239a458214a9a8225f..2190ed5de27e9e888eff78c753f5c6caab03c822 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 01d07281f768aad8db4358647dcb0101c7583001..c96eb328837924b6233faf24b7150c3a8b92db7f 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 ed2c4900acc7aae4aa9f2203a41818b1ba140d55..d6fa2047e92293f3c909544cc64d9f0f9f9708c9 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 c0ab54f107a466c731d48de5ce23d317a489f8f8..9d02972e2c77ce80f2d38e13b4ac70c4bb01297e 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 1d209236ffe26f5698d65ed69d72e50c8643b769..aafc4df603450f620719ad2ee3b2a730b069fc65 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 5e043621528d2d7ec6da01813444848296c25088..773bc5a0445a89e1dc3e27090648102ba789dd14 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 485bbc480b423abe2507d86b86fe719bef3b3e6f..fb548e52533cc6cdf5ebb366dc35bfceb90c68e8 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 db6d63eb88fcb4e14f220801c885a01ba520d404..f9da32262aa03ea5b5a926009a60df821b478485 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 1bdf93ebc153b1fd7bdc19db5ce30c8c357742fc..10f523e6787e33c5af3aebad942e694635cfbe73 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 9328c0d72534be2d59250695398ca2de68c0990c..ff9f374bb9187dd8a092de2ad75a238d986cc1b4 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 0e8d3377a7e8a8ef868ad0453764e343f5e6c392..85eebf03df0ae7184dcc3b56282023d08cb6c242 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 ef4b7200b400e022457b4c355eee64202db5189b..e5e6998de44a7d1c77159d9da8d013341b787f37 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 402dd63fdab88984fd7bcec5cb18033064ca925a..95980e3a2010eab949c6fc9fc8bf18acaf3ba6a6 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 4cd50628949712d3c1aaccfc459231cc1ce785a8..f5a60e681a4972475c936f984c9af6ddbb776a6f 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 2c530a84076bd6653fd52a394a65f2884eef66e1..c03f51b83abee30c9defd138cce4b0cf8eff27d1 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 b3bfd56c225e28129e1612032d98cd0c9fae0292..d3b980f35ffdbe8ac60f8b9a0e31270900fdac45 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 6b06ed35b75d7dc9549da70fdd5c07528e08c7f4..742930711f48c7f421f0cf350b8e6589e566a321 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 f33ca7ebf6edf05afccfc014dbc769d17855ff60..fb1b5664c36e900b4e817f626cd5dfec857e5b1f 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 d3de418720c01850af285fdda87077a85ea9a86e..060b94b89f5e46b3ba71d8dc8791a3e2cbee1044 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 7ea462c7ba1c51bee502db6eaabe61d782323245..37287fbe6afb13666ad6184d9c62c28cfd74eab8 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 5fab5f6c5f374ab6c1b2eb3d4d4a47ba67e86e90..2cdfe5ed12e3f8c6201b54fc0d5e7f9903aebb8d 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 0567d781ef46cc688791f1784282c4462a5a03fc..915f9be2cfedf03824166625c3d6215a13e54f02 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 9d4109b53ef4c199dc1fcd208afa04d00ab36d8b..d7accb27e7918d582b8b5e3907c32d2077401078 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 e8cff228a8ce86c0b25c9f2971f941ad60890fb2..44c18616b2deace28baedaa147198ea716ed7332 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 245bca9705dfad6714e3ad89aa1fbf582a230cf2..caa515a9452fde71d30663e888905cc9070510ee 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 ecfbe4eee1cb306a41c238d76d085346229b8bb3..b5b8f34aed53bf3363252582b85ccbc412675351 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 dce43c0e18f69d37041cb7a028e3ac09dfca64b1..b7b2814ac8fd485149bf3371928532caa4f34d12 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 1e9667b40a9bc77b4d96501b9376ba8d127e6979..dd9ddb2349adff24791ece6e6589524b7f57551d 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 7211395698bf0ebb8cd33dc858a52acaa1421a8a..85fac8b8d6b7bc183e15f98fc49f3e74bdd79255 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)))