From: g0dil Date: Fri, 21 Aug 2009 14:07:47 +0000 (+0000) Subject: Replace all relative includes with abolute ones X-Git-Url: http://g0dil.de/git?p=senf.git;a=commitdiff_plain;h=26610f603ebdd465307b9621f532c1fe19fd5571 Replace all relative includes with abolute ones git-svn-id: https://svn.berlios.de/svnroot/repos/senf/trunk@1317 270642c3-0616-0410-b53a-bc976706d245 --- diff --git a/Examples/psi2tsModule/main.test.cc b/Examples/psi2tsModule/main.test.cc index b710fa9..a5239f8 100644 --- a/Examples/psi2tsModule/main.test.cc +++ b/Examples/psi2tsModule/main.test.cc @@ -27,7 +27,7 @@ // Custom includes #define BOOST_AUTO_TEST_MAIN -#include "../../Utils/auto_unit_test.hh" +#include #include #define prefix_ diff --git a/Examples/psi2tsModule/psi2ts.test.cc b/Examples/psi2tsModule/psi2ts.test.cc index c047c46..b23fc83 100644 --- a/Examples/psi2tsModule/psi2ts.test.cc +++ b/Examples/psi2tsModule/psi2ts.test.cc @@ -24,13 +24,13 @@ \brief psi2ts unit tests */ // Custom includes -#include "senf/PPI/DebugModules.hh" -#include "senf/PPI/Setup.hh" +#include +#include #include #include #include "psi2ts.hh" -#include "../../Utils/auto_unit_test.hh" +#include #include #include diff --git a/_templates/Example.test.cc b/_templates/Example.test.cc index 31d4306..2c24cc8 100644 --- a/_templates/Example.test.cc +++ b/_templates/Example.test.cc @@ -29,7 +29,7 @@ // Custom includes #include "@NAME@.hh" -#include "../../../Utils/auto_unit_test.hh" +#include #include #define prefix_ diff --git a/doclib/html-munge.xsl b/doclib/html-munge.xsl index 17346f7..5b35045 100644 --- a/doclib/html-munge.xsl +++ b/doclib/html-munge.xsl @@ -506,13 +506,4 @@ - - - - - senf/ - - - - diff --git a/include/boost b/include/boost deleted file mode 120000 index 3b732ee..0000000 --- a/include/boost +++ /dev/null @@ -1 +0,0 @@ -../boost \ No newline at end of file diff --git a/include/senf/Console b/include/senf/Console deleted file mode 120000 index 754ef40..0000000 --- a/include/senf/Console +++ /dev/null @@ -1 +0,0 @@ -../../Utils/Console \ No newline at end of file diff --git a/include/senf/Console.hh b/include/senf/Console.hh deleted file mode 100644 index 95cf505..0000000 --- a/include/senf/Console.hh +++ /dev/null @@ -1,34 +0,0 @@ -// $Id$ -// -// Copyright (C) 2007 -// Fraunhofer Institut fuer offene Kommunikationssysteme (FOKUS) -// Kompetenzzentrum fuer Satelitenkommunikation (SatCom) -// Stefan Bund -// -// This program is free software; you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation; either version 2 of the License, or -// (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program; if not, write to the -// Free Software Foundation, Inc., -// 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - -#include "Utils/Console/Console.hh" - - -// Local Variables: -// mode: c++ -// fill-column: 100 -// comment-column: 40 -// c-file-style: "senf" -// indent-tabs-mode: nil -// ispell-local-dictionary: "american" -// compile-command: "scons -u test" -// End: diff --git a/include/senf/PPI b/include/senf/PPI deleted file mode 120000 index 49d378c..0000000 --- a/include/senf/PPI +++ /dev/null @@ -1 +0,0 @@ -../../PPI \ No newline at end of file diff --git a/include/senf/Packets b/include/senf/Packets deleted file mode 120000 index d84aca5..0000000 --- a/include/senf/Packets +++ /dev/null @@ -1 +0,0 @@ -../../Packets \ No newline at end of file diff --git a/include/senf/Scheduler b/include/senf/Scheduler deleted file mode 120000 index 2bf96cf..0000000 --- a/include/senf/Scheduler +++ /dev/null @@ -1 +0,0 @@ -../../Scheduler \ No newline at end of file diff --git a/include/senf/Socket b/include/senf/Socket deleted file mode 120000 index bb3e832..0000000 --- a/include/senf/Socket +++ /dev/null @@ -1 +0,0 @@ -../../Socket \ No newline at end of file diff --git a/include/senf/Utils b/include/senf/Utils deleted file mode 120000 index 71341d8..0000000 --- a/include/senf/Utils +++ /dev/null @@ -1 +0,0 @@ -../../Utils \ No newline at end of file diff --git a/include/senf/config.hh b/include/senf/config.hh deleted file mode 120000 index ea97ba7..0000000 --- a/include/senf/config.hh +++ /dev/null @@ -1 +0,0 @@ -../../config.hh \ No newline at end of file diff --git a/include/senf/local_config.hh b/include/senf/local_config.hh deleted file mode 120000 index cc4d9c9..0000000 --- a/include/senf/local_config.hh +++ /dev/null @@ -1 +0,0 @@ -../../local_config.hh \ No newline at end of file diff --git a/senf/PPI.hh b/senf/PPI.hh index 1ae8be8..7e26d3f 100644 --- a/senf/PPI.hh +++ b/senf/PPI.hh @@ -20,7 +20,7 @@ // Free Software Foundation, Inc., // 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -#include "PPI/PPI.hh" +#include // Local Variables: diff --git a/senf/PPI/ActiveFeeder.test.cc b/senf/PPI/ActiveFeeder.test.cc index 8d9aa55..90d3722 100644 --- a/senf/PPI/ActiveFeeder.test.cc +++ b/senf/PPI/ActiveFeeder.test.cc @@ -31,7 +31,7 @@ #include "DebugModules.hh" #include "Setup.hh" -#include "../Utils/auto_unit_test.hh" +#include #include #define prefix_ diff --git a/senf/PPI/AnnotationRouter.hh b/senf/PPI/AnnotationRouter.hh index e438755..d52f58a 100644 --- a/senf/PPI/AnnotationRouter.hh +++ b/senf/PPI/AnnotationRouter.hh @@ -28,7 +28,7 @@ // Custom includes #include -#include "../Utils/String.hh" +#include #include "Module.hh" #include "Connectors.hh" #include "MultiConnectorMixin.hh" diff --git a/senf/PPI/AnnotationRouter.test.cc b/senf/PPI/AnnotationRouter.test.cc index 7787864..670d929 100644 --- a/senf/PPI/AnnotationRouter.test.cc +++ b/senf/PPI/AnnotationRouter.test.cc @@ -30,7 +30,7 @@ #include "AnnotationRouter.hh" #include "DebugModules.hh" -#include "../Utils//auto_unit_test.hh" +#include #include #define prefix_ diff --git a/senf/PPI/CloneSource.hh b/senf/PPI/CloneSource.hh index 3ce6089..4376631 100644 --- a/senf/PPI/CloneSource.hh +++ b/senf/PPI/CloneSource.hh @@ -27,7 +27,7 @@ #define HH_SENF_PPI_CloneSource_ 1 // Custom includes -#include "../Packets/Packets.hh" +#include #include "Module.hh" #include "Connectors.hh" diff --git a/senf/PPI/CloneSource.test.cc b/senf/PPI/CloneSource.test.cc index d2f459c..9da9f80 100644 --- a/senf/PPI/CloneSource.test.cc +++ b/senf/PPI/CloneSource.test.cc @@ -30,9 +30,9 @@ #include "CloneSource.hh" #include "DebugModules.hh" #include "Setup.hh" -#include "../Packets/Packets.hh" +#include -#include "../Utils/auto_unit_test.hh" +#include #include #define prefix_ diff --git a/senf/PPI/Connectors.cc b/senf/PPI/Connectors.cc index ce44e0d..156a717 100644 --- a/senf/PPI/Connectors.cc +++ b/senf/PPI/Connectors.cc @@ -30,7 +30,7 @@ #include "Route.hh" #include "Module.hh" #include "ModuleManager.hh" -#include "../Utils/Console/Console.hh" +#include //#include "Connectors.mpp" #define prefix_ diff --git a/senf/PPI/Connectors.cci b/senf/PPI/Connectors.cci index ec587ce..f133b97 100644 --- a/senf/PPI/Connectors.cci +++ b/senf/PPI/Connectors.cci @@ -24,8 +24,8 @@ \brief Connectors inline non-template implementation */ // Custom includes -#include "../Utils/TypeInfo.hh" -#include "../Utils/senfassert.hh" +#include +#include #define prefix_ inline ///////////////////////////////cci.p/////////////////////////////////////// diff --git a/senf/PPI/Connectors.hh b/senf/PPI/Connectors.hh index e6b8c07..ddf907e 100644 --- a/senf/PPI/Connectors.hh +++ b/senf/PPI/Connectors.hh @@ -30,9 +30,9 @@ #include #include #include -#include "../Utils/safe_bool.hh" -#include "../Utils/Exception.hh" -#include "../Packets/Packets.hh" +#include +#include +#include #include "predecl.hh" #include "detail/Callback.hh" #include "Queueing.hh" diff --git a/senf/PPI/Connectors.test.cc b/senf/PPI/Connectors.test.cc index 20b7e3e..f8ed64d 100644 --- a/senf/PPI/Connectors.test.cc +++ b/senf/PPI/Connectors.test.cc @@ -31,7 +31,7 @@ #include "DebugModules.hh" #include "Setup.hh" -#include "../Utils/auto_unit_test.hh" +#include #include #define prefix_ diff --git a/senf/PPI/DebugEvent.test.cc b/senf/PPI/DebugEvent.test.cc index e721ca9..987cfae 100644 --- a/senf/PPI/DebugEvent.test.cc +++ b/senf/PPI/DebugEvent.test.cc @@ -29,7 +29,7 @@ // Custom includes #include "DebugEvent.hh" -#include "../Utils/auto_unit_test.hh" +#include #include #define prefix_ diff --git a/senf/PPI/DebugModules.cci b/senf/PPI/DebugModules.cci index 1326326..787fa35 100644 --- a/senf/PPI/DebugModules.cci +++ b/senf/PPI/DebugModules.cci @@ -24,7 +24,7 @@ \brief DebugModules inline non-template implementation */ // Custom includes -#include "../Utils/senfassert.hh" +#include #include "Setup.hh" #define prefix_ inline diff --git a/senf/PPI/DebugModules.cti b/senf/PPI/DebugModules.cti index 9ab80f0..bbdd939 100644 --- a/senf/PPI/DebugModules.cti +++ b/senf/PPI/DebugModules.cti @@ -26,7 +26,7 @@ //#include "DebugModules.ih" // Custom includes -#include "../Utils/hexdump.hh" +#include #define prefix_ inline ///////////////////////////////cti.p/////////////////////////////////////// diff --git a/senf/PPI/DebugModules.hh b/senf/PPI/DebugModules.hh index 27212c6..760a4af 100644 --- a/senf/PPI/DebugModules.hh +++ b/senf/PPI/DebugModules.hh @@ -28,11 +28,11 @@ // Custom includes #include -#include "../Utils/safe_bool.hh" -#include "../Packets/Packets.hh" +#include +#include #include "MonitorModule.hh" #include "ActiveFeeder.hh" -#include "../Utils/Logger/SenfLog.hh" +#include //#include "DebugModules.mpp" ///////////////////////////////hh.p//////////////////////////////////////// diff --git a/senf/PPI/DebugModules.test.cc b/senf/PPI/DebugModules.test.cc index edd29b8..ebdc568 100644 --- a/senf/PPI/DebugModules.test.cc +++ b/senf/PPI/DebugModules.test.cc @@ -32,11 +32,11 @@ #define SENF_LOG_CONF (( (senf)(log)(Debug), (_), VERBOSE )) -#include "../Packets/Packets.hh" +#include #include "DebugModules.hh" #include "Setup.hh" -#include "../Utils/auto_unit_test.hh" +#include #include #define prefix_ diff --git a/senf/PPI/DiscardSink.test.cc b/senf/PPI/DiscardSink.test.cc index b57c6db..5e32f96 100644 --- a/senf/PPI/DiscardSink.test.cc +++ b/senf/PPI/DiscardSink.test.cc @@ -31,7 +31,7 @@ #include "DebugModules.hh" #include "Setup.hh" -#include "../Utils/auto_unit_test.hh" +#include #include #define prefix_ diff --git a/senf/PPI/Duplicators.test.cc b/senf/PPI/Duplicators.test.cc index 40f40d9..ed8701f 100644 --- a/senf/PPI/Duplicators.test.cc +++ b/senf/PPI/Duplicators.test.cc @@ -30,9 +30,9 @@ #include "Duplicators.hh" #include "DebugModules.hh" #include "Setup.hh" -#include "../Packets/Packets.hh" +#include -#include "../Utils/auto_unit_test.hh" +#include #include #define prefix_ diff --git a/senf/PPI/EventManager.cci b/senf/PPI/EventManager.cci index d88db89..85fcb1f 100644 --- a/senf/PPI/EventManager.cci +++ b/senf/PPI/EventManager.cci @@ -26,7 +26,7 @@ //#include "EventManager.ih" // Custom includes -#include "../Scheduler/Scheduler.hh" +#include #define prefix_ inline ///////////////////////////////cci.p/////////////////////////////////////// diff --git a/senf/PPI/EventManager.hh b/senf/PPI/EventManager.hh index 20535a0..0f5fd9c 100644 --- a/senf/PPI/EventManager.hh +++ b/senf/PPI/EventManager.hh @@ -28,7 +28,7 @@ // Custom includes #include -#include "../Scheduler/ClockService.hh" +#include #include "predecl.hh" #include "detail/Callback.hh" #include "detail/EventBinding.hh" diff --git a/senf/PPI/EventManager.test.cc b/senf/PPI/EventManager.test.cc index ed750a9..d0e1f22 100644 --- a/senf/PPI/EventManager.test.cc +++ b/senf/PPI/EventManager.test.cc @@ -29,7 +29,7 @@ // Custom includes #include "EventManager.hh" -#include "../Utils/auto_unit_test.hh" +#include #include #define prefix_ diff --git a/senf/PPI/Events.cci b/senf/PPI/Events.cci index 7a42b28..8ba444a 100644 --- a/senf/PPI/Events.cci +++ b/senf/PPI/Events.cci @@ -24,7 +24,7 @@ \brief Events inline non-template implementation */ // Custom includes -#include "../Utils/senfassert.hh" +#include #define prefix_ inline ///////////////////////////////cci.p/////////////////////////////////////// diff --git a/senf/PPI/Events.cti b/senf/PPI/Events.cti index 435fe3a..9478b8e 100644 --- a/senf/PPI/Events.cti +++ b/senf/PPI/Events.cti @@ -26,7 +26,7 @@ #include "Events.ih" // Custom includes -#include "../Utils/senfassert.hh" +#include #include "detail/EventBinding.hh" #define prefix_ inline diff --git a/senf/PPI/Events.hh b/senf/PPI/Events.hh index 39e9d48..8e922cd 100644 --- a/senf/PPI/Events.hh +++ b/senf/PPI/Events.hh @@ -28,7 +28,7 @@ // Custom includes #include -#include "../Scheduler/ClockService.hh" +#include #include "predecl.hh" //#include "Events.mpp" diff --git a/senf/PPI/Events.test.cc b/senf/PPI/Events.test.cc index c80448a..f090864 100644 --- a/senf/PPI/Events.test.cc +++ b/senf/PPI/Events.test.cc @@ -29,7 +29,7 @@ // Custom includes #include "Events.hh" -#include "../Utils/auto_unit_test.hh" +#include #include #define prefix_ diff --git a/senf/PPI/IOEvent.cc b/senf/PPI/IOEvent.cc index 7517e41..3a38feb 100644 --- a/senf/PPI/IOEvent.cc +++ b/senf/PPI/IOEvent.cc @@ -27,7 +27,7 @@ //#include "IOEvent.ih" // Custom includes -#include "../Utils/senfassert.hh" +#include //#include "IOEvent.mpp" #define prefix_ diff --git a/senf/PPI/IOEvent.hh b/senf/PPI/IOEvent.hh index 0d19eb3..ac08128 100644 --- a/senf/PPI/IOEvent.hh +++ b/senf/PPI/IOEvent.hh @@ -27,9 +27,9 @@ #define HH_SENF_PPI_IOEvent_ 1 // Custom includes -#include "../Scheduler/Scheduler.hh" +#include #include "Events.hh" -#include "../Utils/Exception.hh" +#include //#include "IOEvent.mpp" ///////////////////////////////hh.p//////////////////////////////////////// diff --git a/senf/PPI/IOEvent.test.cc b/senf/PPI/IOEvent.test.cc index 226f281..35bc6ac 100644 --- a/senf/PPI/IOEvent.test.cc +++ b/senf/PPI/IOEvent.test.cc @@ -29,7 +29,7 @@ // Custom includes #include "IOEvent.hh" -#include "../Utils/auto_unit_test.hh" +#include #include #define prefix_ diff --git a/senf/PPI/IdleEvent.cc b/senf/PPI/IdleEvent.cc index 4c98ad5..87f0bf2 100644 --- a/senf/PPI/IdleEvent.cc +++ b/senf/PPI/IdleEvent.cc @@ -27,8 +27,8 @@ //#include "IdleEvent.ih" // Custom includes -#include "../Scheduler/Scheduler.hh" -#include "../Utils/Logger/SenfLog.hh" +#include +#include //#include "IdleEvent.mpp" #define prefix_ diff --git a/senf/PPI/IdleEvent.test.cc b/senf/PPI/IdleEvent.test.cc index c5f2352..0996541 100644 --- a/senf/PPI/IdleEvent.test.cc +++ b/senf/PPI/IdleEvent.test.cc @@ -29,7 +29,7 @@ // Custom includes #include "IdleEvent.hh" -#include "../Utils/auto_unit_test.hh" +#include #include #define prefix_ diff --git a/senf/PPI/IntervalTimer.cc b/senf/PPI/IntervalTimer.cc index e4dff93..08a6b00 100644 --- a/senf/PPI/IntervalTimer.cc +++ b/senf/PPI/IntervalTimer.cc @@ -27,7 +27,7 @@ //#include "IntervalTimer.ih" // Custom includes -#include "../Scheduler/Scheduler.hh" +#include #include "EventManager.hh" //#include "IntervalTimer.mpp" diff --git a/senf/PPI/IntervalTimer.hh b/senf/PPI/IntervalTimer.hh index 959c48c..8c5b203 100644 --- a/senf/PPI/IntervalTimer.hh +++ b/senf/PPI/IntervalTimer.hh @@ -27,7 +27,7 @@ #define HH_SENF_PPI_IntervalTimer_ 1 // Custom includes -#include "../Scheduler/ClockService.hh" +#include #include "Events.hh" //#include "IntervalTimer.mpp" diff --git a/senf/PPI/IntervalTimer.test.cc b/senf/PPI/IntervalTimer.test.cc index 45f87f9..e8e746c 100644 --- a/senf/PPI/IntervalTimer.test.cc +++ b/senf/PPI/IntervalTimer.test.cc @@ -31,7 +31,7 @@ #include "Module.hh" #include "Setup.hh" -#include "../Utils/auto_unit_test.hh" +#include #include #define prefix_ diff --git a/senf/PPI/Jack.test.cc b/senf/PPI/Jack.test.cc index bc6b0c1..93734b5 100644 --- a/senf/PPI/Jack.test.cc +++ b/senf/PPI/Jack.test.cc @@ -29,7 +29,7 @@ // Custom includes #include "PPI.hh" -#include "../Utils/auto_unit_test.hh" +#include #include #define prefix_ diff --git a/senf/PPI/Joins.test.cc b/senf/PPI/Joins.test.cc index 44e9759..433e2cb 100644 --- a/senf/PPI/Joins.test.cc +++ b/senf/PPI/Joins.test.cc @@ -30,9 +30,9 @@ #include "Joins.hh" #include "DebugModules.hh" #include "Setup.hh" -#include "../Packets/Packets.hh" +#include -#include "../Utils/auto_unit_test.hh" +#include #include #define prefix_ diff --git a/senf/PPI/Module.hh b/senf/PPI/Module.hh index b2b3ecd..e4f2599 100644 --- a/senf/PPI/Module.hh +++ b/senf/PPI/Module.hh @@ -31,7 +31,7 @@ #include #include #include -#include "../Scheduler/ClockService.hh" +#include #include "predecl.hh" #include "ModuleManager.hh" diff --git a/senf/PPI/Module.test.cc b/senf/PPI/Module.test.cc index 2f6df29..bc72b70 100644 --- a/senf/PPI/Module.test.cc +++ b/senf/PPI/Module.test.cc @@ -28,13 +28,13 @@ // Custom includes #include -#include "../Utils/membind.hh" +#include #include "DebugEvent.hh" #include "DebugModules.hh" #include "Setup.hh" #include "Module.hh" -#include "../Utils/auto_unit_test.hh" +#include #include #include diff --git a/senf/PPI/ModuleManager.cc b/senf/PPI/ModuleManager.cc index 77f190c..3d2b3d5 100644 --- a/senf/PPI/ModuleManager.cc +++ b/senf/PPI/ModuleManager.cc @@ -27,10 +27,10 @@ //#include "ModuleManager.ih" // Custom includes -#include "../Scheduler/Scheduler.hh" -#include "../Utils/membind.hh" +#include +#include #include "Module.hh" -#include "../Utils/Console/Console.hh" +#include //#include "ModuleManager.mpp" #define prefix_ diff --git a/senf/PPI/ModuleManager.hh b/senf/PPI/ModuleManager.hh index c8b411d..6d22dc6 100644 --- a/senf/PPI/ModuleManager.hh +++ b/senf/PPI/ModuleManager.hh @@ -30,8 +30,8 @@ #include #include #include "predecl.hh" -#include "../Scheduler/Scheduler.hh" -#include "../Utils/Console/ScopedDirectory.hh" +#include +#include //#include "ModuleManager.mpp" ///////////////////////////////hh.p//////////////////////////////////////// diff --git a/senf/PPI/ModuleManager.test.cc b/senf/PPI/ModuleManager.test.cc index c6f1373..20c5080 100644 --- a/senf/PPI/ModuleManager.test.cc +++ b/senf/PPI/ModuleManager.test.cc @@ -29,7 +29,7 @@ // Custom includes #include "ModuleManager.hh" -#include "../Utils/auto_unit_test.hh" +#include #include #define prefix_ diff --git a/senf/PPI/MonitorModule.test.cc b/senf/PPI/MonitorModule.test.cc index c86cd84..ab9ce99 100644 --- a/senf/PPI/MonitorModule.test.cc +++ b/senf/PPI/MonitorModule.test.cc @@ -30,7 +30,7 @@ #include "MonitorModule.hh" #include "DebugModules.hh" -#include "../Utils/auto_unit_test.hh" +#include #include #define prefix_ diff --git a/senf/PPI/MultiConnectorMixin.hh b/senf/PPI/MultiConnectorMixin.hh index b386e01..c154657 100644 --- a/senf/PPI/MultiConnectorMixin.hh +++ b/senf/PPI/MultiConnectorMixin.hh @@ -27,7 +27,7 @@ #define HH_SENF_PPI_MultiConnectorMixin_ 1 // Custom includes -#include "../config.hh" +#include #include #include #include diff --git a/senf/PPI/MultiConnectorMixin.test.cc b/senf/PPI/MultiConnectorMixin.test.cc index 6e05ebe..34a8b47 100644 --- a/senf/PPI/MultiConnectorMixin.test.cc +++ b/senf/PPI/MultiConnectorMixin.test.cc @@ -29,7 +29,7 @@ // Custom includes #include "PPI.hh" -#include "../Utils/auto_unit_test.hh" +#include #include #define prefix_ diff --git a/senf/PPI/PassiveQueue.test.cc b/senf/PPI/PassiveQueue.test.cc index 172db85..232b63d 100644 --- a/senf/PPI/PassiveQueue.test.cc +++ b/senf/PPI/PassiveQueue.test.cc @@ -30,9 +30,9 @@ #include "PassiveQueue.hh" #include "DebugModules.hh" #include "Setup.hh" -#include "../Packets/Packets.hh" +#include -#include "../Utils/auto_unit_test.hh" +#include #include #define prefix_ diff --git a/senf/PPI/Queueing.test.cc b/senf/PPI/Queueing.test.cc index 5f18e15..eab8d66 100644 --- a/senf/PPI/Queueing.test.cc +++ b/senf/PPI/Queueing.test.cc @@ -31,10 +31,10 @@ #include "Module.hh" #include "Connectors.hh" #include "DebugModules.hh" -#include "../Packets/Packets.hh" +#include #include "Setup.hh" -#include "../Utils/auto_unit_test.hh" +#include #include #define prefix_ diff --git a/senf/PPI/RateAnalyzer.test.cc b/senf/PPI/RateAnalyzer.test.cc index 110c929..c5ac146 100644 --- a/senf/PPI/RateAnalyzer.test.cc +++ b/senf/PPI/RateAnalyzer.test.cc @@ -30,7 +30,7 @@ #include "RateAnalyzer.hh" #include "PPI.hh" -#include "../Utils/auto_unit_test.hh" +#include #include #include diff --git a/senf/PPI/RateFilter.test.cc b/senf/PPI/RateFilter.test.cc index f7e1663..cdaddc8 100644 --- a/senf/PPI/RateFilter.test.cc +++ b/senf/PPI/RateFilter.test.cc @@ -27,9 +27,9 @@ #include "RateFilter.hh" #include "DebugModules.hh" #include "Setup.hh" -#include "../Utils/membind.hh" +#include -#include "../Utils/auto_unit_test.hh" +#include #include #define prefix_ diff --git a/senf/PPI/Route.test.cc b/senf/PPI/Route.test.cc index 68e7ffd..f798e4f 100644 --- a/senf/PPI/Route.test.cc +++ b/senf/PPI/Route.test.cc @@ -36,10 +36,10 @@ #include "CloneSource.hh" #include "Joins.hh" #include "PassiveQueue.hh" -#include "../Utils/membind.hh" -#include "../Utils/senfassert.hh" +#include +#include -#include "../Utils/auto_unit_test.hh" +#include #include #define prefix_ diff --git a/senf/PPI/Setup.test.cc b/senf/PPI/Setup.test.cc index 6a2477a..ea12ce4 100644 --- a/senf/PPI/Setup.test.cc +++ b/senf/PPI/Setup.test.cc @@ -29,7 +29,7 @@ // Custom includes #include "Setup.hh" -#include "../Utils/auto_unit_test.hh" +#include #include #define prefix_ diff --git a/senf/PPI/SocketSink.cc b/senf/PPI/SocketSink.cc index ef3dbc4..8851fbf 100644 --- a/senf/PPI/SocketSink.cc +++ b/senf/PPI/SocketSink.cc @@ -25,7 +25,7 @@ // Custom includes #include "SocketSink.hh" -#include "../Socket/ClientSocketHandle.hh" +#include #define prefix_ diff --git a/senf/PPI/SocketSink.cci b/senf/PPI/SocketSink.cci index d34a003..3eb851e 100644 --- a/senf/PPI/SocketSink.cci +++ b/senf/PPI/SocketSink.cci @@ -25,7 +25,7 @@ // Custom includes #include "SocketSink.hh" -#include "../Socket/ClientSocketHandle.hh" +#include #define prefix_ inline ///////////////////////////////cci.p/////////////////////////////////////// diff --git a/senf/PPI/SocketSink.hh b/senf/PPI/SocketSink.hh index ee944dd..204e1ea 100644 --- a/senf/PPI/SocketSink.hh +++ b/senf/PPI/SocketSink.hh @@ -27,15 +27,15 @@ #define HH_SENF_PPI_SocketSink_ 1 // Custom includes -#include "../Packets/Packets.hh" -#include "../Socket/ClientSocketHandle.hh" -#include "../Socket/SocketPolicy.hh" -#include "../Socket/ReadWritePolicy.hh" -#include "../Socket/FramingPolicy.hh" -#include "../Socket/CommunicationPolicy.hh" +#include +#include +#include +#include +#include +#include #include "Module.hh" #include "Connectors.hh" -#include "../Socket/Protocols/INet/INetAddressing.hh" +#include #include "IOEvent.hh" //#include "SocketSink.mpp" diff --git a/senf/PPI/SocketSink.test.cc b/senf/PPI/SocketSink.test.cc index 5b7f420..9fc999a 100644 --- a/senf/PPI/SocketSink.test.cc +++ b/senf/PPI/SocketSink.test.cc @@ -27,14 +27,14 @@ //#include "SocketSink.test.ih" // Custom includes -#include "../Socket/Protocols/INet/UDPSocketHandle.hh" -#include "../Socket/Protocols/INet/ConnectedUDPSocketHandle.hh" +#include +#include #include "SocketSource.hh" #include "DebugModules.hh" #include "SocketSink.hh" #include "Setup.hh" -#include "../Utils/auto_unit_test.hh" +#include #include #define prefix_ diff --git a/senf/PPI/SocketSource.hh b/senf/PPI/SocketSource.hh index ceb5bc8..9000ed6 100644 --- a/senf/PPI/SocketSource.hh +++ b/senf/PPI/SocketSource.hh @@ -27,11 +27,11 @@ #define HH_SENF_PPI_SocketSource_ 1 // Custom includes -#include "../Packets/Packets.hh" -#include "../Socket/ClientSocketHandle.hh" -#include "../Socket/SocketPolicy.hh" -#include "../Socket/ReadWritePolicy.hh" -#include "../Socket/FramingPolicy.hh" +#include +#include +#include +#include +#include #include "Module.hh" #include "Connectors.hh" #include "IOEvent.hh" diff --git a/senf/PPI/SocketSource.test.cc b/senf/PPI/SocketSource.test.cc index c8947a1..4bf23ef 100644 --- a/senf/PPI/SocketSource.test.cc +++ b/senf/PPI/SocketSource.test.cc @@ -28,13 +28,13 @@ // Custom includes #include -#include "../Socket/Protocols/INet/UDPSocketHandle.hh" -#include "../Scheduler/Scheduler.hh" +#include +#include #include "SocketSource.hh" #include "DebugModules.hh" #include "Setup.hh" -#include "../Utils/auto_unit_test.hh" +#include #include #define prefix_ diff --git a/senf/PPI/ThrottleBarrier.test.cc b/senf/PPI/ThrottleBarrier.test.cc index 4c7abef..ad66dd7 100644 --- a/senf/PPI/ThrottleBarrier.test.cc +++ b/senf/PPI/ThrottleBarrier.test.cc @@ -29,9 +29,9 @@ // Custom includes #include "ThrottleBarrier.hh" #include "DebugModules.hh" -#include "../Packets/Packets.hh" +#include -#include "../Utils/auto_unit_test.hh" +#include #include #define prefix_ diff --git a/senf/PPI/detail/EventBinding.cc b/senf/PPI/detail/EventBinding.cc index b582367..65aa700 100644 --- a/senf/PPI/detail/EventBinding.cc +++ b/senf/PPI/detail/EventBinding.cc @@ -27,7 +27,7 @@ //#include "EventBinding.ih" // Custom includes -#include "../EventManager.hh" +#include //#include "EventBinding.mpp" #define prefix_ diff --git a/senf/PPI/detail/EventBinding.cci b/senf/PPI/detail/EventBinding.cci index 2d93c7d..032d4bd 100644 --- a/senf/PPI/detail/EventBinding.cci +++ b/senf/PPI/detail/EventBinding.cci @@ -24,7 +24,7 @@ \brief EventBinding inline non-template implementation */ // Custom includes -#include "../Events.hh" +#include #define prefix_ inline ///////////////////////////////cci.p/////////////////////////////////////// diff --git a/senf/PPI/detail/EventBinding.cti b/senf/PPI/detail/EventBinding.cti index 09fc719..96a81a6 100644 --- a/senf/PPI/detail/EventBinding.cti +++ b/senf/PPI/detail/EventBinding.cti @@ -26,7 +26,7 @@ //#include "EventBinding.ih" // Custom includes -#include "../EventManager.hh" +#include #define prefix_ inline ///////////////////////////////cti.p/////////////////////////////////////// diff --git a/senf/PPI/detail/EventBinding.hh b/senf/PPI/detail/EventBinding.hh index f489879..97087c2 100644 --- a/senf/PPI/detail/EventBinding.hh +++ b/senf/PPI/detail/EventBinding.hh @@ -27,8 +27,8 @@ #define HH_SENF_PPI_detail_EventBinding_ 1 // Custom includes -#include "../../Scheduler/ClockService.hh" -#include "../predecl.hh" +#include +#include #include "Callback.hh" //#include "EventBinding.mpp" diff --git a/senf/PPI/main.test.cc b/senf/PPI/main.test.cc index d2f37be..9f91d17 100644 --- a/senf/PPI/main.test.cc +++ b/senf/PPI/main.test.cc @@ -27,7 +27,7 @@ // Custom includes #define BOOST_AUTO_TEST_MAIN -#include "../Utils/auto_unit_test.hh" +#include #include #define prefix_ diff --git a/senf/Packets.hh b/senf/Packets.hh index 2fc2096..dae0112 100644 --- a/senf/Packets.hh +++ b/senf/Packets.hh @@ -20,7 +20,7 @@ // Free Software Foundation, Inc., // 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -#include "Packets/Packets.hh" +#include // Local Variables: diff --git a/senf/Packets/80211Bundle/RadiotapPacket.cc b/senf/Packets/80211Bundle/RadiotapPacket.cc index 028c9c1..16bcb00 100644 --- a/senf/Packets/80211Bundle/RadiotapPacket.cc +++ b/senf/Packets/80211Bundle/RadiotapPacket.cc @@ -25,7 +25,7 @@ // Custom includes #include "RadiotapPacket.hh" #include "WLANPacket.hh" -#include "../../Packets/Packets.hh" +#include #include #define prefix_ diff --git a/senf/Packets/80211Bundle/RadiotapPacket.hh b/senf/Packets/80211Bundle/RadiotapPacket.hh index c6fe53c..a9dc79b 100644 --- a/senf/Packets/80211Bundle/RadiotapPacket.hh +++ b/senf/Packets/80211Bundle/RadiotapPacket.hh @@ -26,7 +26,7 @@ #ifndef HH_SENF_Packets_80211Bundle_RadiotapPacket_ #define HH_SENF_Packets_80211Bundle_RadiotapPacket_ 1 -#include "../../Packets/Packets.hh" +#include namespace senf { diff --git a/senf/Packets/80211Bundle/RadiotapPacket.test.cc b/senf/Packets/80211Bundle/RadiotapPacket.test.cc index c537bc4..b16a46f 100644 --- a/senf/Packets/80211Bundle/RadiotapPacket.test.cc +++ b/senf/Packets/80211Bundle/RadiotapPacket.test.cc @@ -25,9 +25,9 @@ // Custom includes #include "RadiotapPacket.hh" -#include "../../Packets/Packets.hh" +#include -#include "../../Utils/auto_unit_test.hh" +#include #include ///////////////////////////////cc.p//////////////////////////////////////// diff --git a/senf/Packets/80211Bundle/WLANPacket.cc b/senf/Packets/80211Bundle/WLANPacket.cc index 413d229..1eb13e9 100644 --- a/senf/Packets/80211Bundle/WLANPacket.cc +++ b/senf/Packets/80211Bundle/WLANPacket.cc @@ -24,7 +24,7 @@ // Custom includes #include "WLANPacket.hh" -#include "../../Packets/Packets.hh" +#include #include #define prefix_ diff --git a/senf/Packets/80211Bundle/WLANPacket.hh b/senf/Packets/80211Bundle/WLANPacket.hh index c632aa5..b406a94 100644 --- a/senf/Packets/80211Bundle/WLANPacket.hh +++ b/senf/Packets/80211Bundle/WLANPacket.hh @@ -26,9 +26,9 @@ #ifndef HH_SENF_Packets_80211Bundle_WLANPacket_ #define HH_SENF_Packets_80211Bundle_WLANPacket_ 1 -#include "../../Packets/Packets.hh" -#include "../DefaultBundle/EthernetPacket.hh" -#include "../DefaultBundle/LlcSnapPacket.hh" +#include +#include +#include namespace senf { diff --git a/senf/Packets/80211Bundle/WLANPacket.test.cc b/senf/Packets/80211Bundle/WLANPacket.test.cc index 608fbda..1c0a7c5 100644 --- a/senf/Packets/80211Bundle/WLANPacket.test.cc +++ b/senf/Packets/80211Bundle/WLANPacket.test.cc @@ -25,10 +25,10 @@ // Custom includes #include "WLANPacket.hh" -#include "../../Packets/Packets.hh" -#include "../DefaultBundle/LlcSnapPacket.hh" +#include +#include -#include "../../Utils/auto_unit_test.hh" +#include #include ///////////////////////////////cc.p//////////////////////////////////////// diff --git a/senf/Packets/80211Bundle/main.test.cc b/senf/Packets/80211Bundle/main.test.cc index b7b129a..9f91d17 100644 --- a/senf/Packets/80211Bundle/main.test.cc +++ b/senf/Packets/80211Bundle/main.test.cc @@ -27,7 +27,7 @@ // Custom includes #define BOOST_AUTO_TEST_MAIN -#include "../../Utils/auto_unit_test.hh" +#include #include #define prefix_ diff --git a/senf/Packets/80221Bundle/MIHPacket.cc b/senf/Packets/80221Bundle/MIHPacket.cc index 388d450..05718d9 100644 --- a/senf/Packets/80221Bundle/MIHPacket.cc +++ b/senf/Packets/80221Bundle/MIHPacket.cc @@ -27,8 +27,8 @@ //#include "MIHPacket.ih" // Custom includes -#include "../../Packets/Packets.hh" -#include "../../Utils/hexdump.hh" +#include +#include #include #define prefix_ diff --git a/senf/Packets/80221Bundle/MIHPacket.hh b/senf/Packets/80221Bundle/MIHPacket.hh index adff97e..e5083c5 100644 --- a/senf/Packets/80221Bundle/MIHPacket.hh +++ b/senf/Packets/80221Bundle/MIHPacket.hh @@ -27,14 +27,14 @@ #define HH_SENF_Packets_80221Bundle_MIHPacket_ 1 // Custom includes -#include "../../Packets/Packets.hh" -#include "../../Socket/Protocols/Raw/MACAddress.hh" -#include "../../Socket/Protocols/INet/INet4Address.hh" -#include "../../Socket/Protocols/INet/INet6Address.hh" +#include +#include +#include +#include #include "TLVPacket.hh" #include #include -#include "boost/variant.hpp" +#include //#include "MIHPacket.mpp" diff --git a/senf/Packets/80221Bundle/MIHPacket.test.cc b/senf/Packets/80221Bundle/MIHPacket.test.cc index e9a040e..48667c9 100644 --- a/senf/Packets/80221Bundle/MIHPacket.test.cc +++ b/senf/Packets/80221Bundle/MIHPacket.test.cc @@ -29,7 +29,7 @@ // Custom includes #include "MIHPacket.hh" -#include "../../Utils/auto_unit_test.hh" +#include #include #define prefix_ diff --git a/senf/Packets/80221Bundle/TLVPacket.cc b/senf/Packets/80221Bundle/TLVPacket.cc index 1e0e997..56de029 100644 --- a/senf/Packets/80221Bundle/TLVPacket.cc +++ b/senf/Packets/80221Bundle/TLVPacket.cc @@ -28,7 +28,7 @@ // Custom includes #include -#include "../../Utils/hexdump.hh" +#include #define prefix_ ///////////////////////////////cc.p//////////////////////////////////////// diff --git a/senf/Packets/80221Bundle/TLVPacket.hh b/senf/Packets/80221Bundle/TLVPacket.hh index 2151e7f..5ed3ab3 100644 --- a/senf/Packets/80221Bundle/TLVPacket.hh +++ b/senf/Packets/80221Bundle/TLVPacket.hh @@ -28,7 +28,7 @@ // Custom includes #include -#include "../../Packets/Packets.hh" +#include //#include "TLVPacket.mpp" ///////////////////////////////hh.p//////////////////////////////////////// diff --git a/senf/Packets/80221Bundle/TLVPacket.test.cc b/senf/Packets/80221Bundle/TLVPacket.test.cc index 2e1c265..6d143d6 100644 --- a/senf/Packets/80221Bundle/TLVPacket.test.cc +++ b/senf/Packets/80221Bundle/TLVPacket.test.cc @@ -28,9 +28,9 @@ // Custom includes #include "TLVPacket.hh" -#include "../DefaultBundle/EthernetPacket.hh" +#include -#include "../../Utils/auto_unit_test.hh" +#include #include #define prefix_ diff --git a/senf/Packets/80221Bundle/main.test.cc b/senf/Packets/80221Bundle/main.test.cc index b7b129a..9f91d17 100644 --- a/senf/Packets/80221Bundle/main.test.cc +++ b/senf/Packets/80221Bundle/main.test.cc @@ -27,7 +27,7 @@ // Custom includes #define BOOST_AUTO_TEST_MAIN -#include "../../Utils/auto_unit_test.hh" +#include #include #define prefix_ diff --git a/senf/Packets/ArrayParser.cti b/senf/Packets/ArrayParser.cti index 874b248..c518389 100644 --- a/senf/Packets/ArrayParser.cti +++ b/senf/Packets/ArrayParser.cti @@ -26,7 +26,7 @@ #include "ArrayParser.ih" // Custom includes -#include "../Utils/senfassert.hh" +#include #define prefix_ inline ///////////////////////////////cti.p/////////////////////////////////////// diff --git a/senf/Packets/ArrayParser.test.cc b/senf/Packets/ArrayParser.test.cc index fe5c517..7d12add 100644 --- a/senf/Packets/ArrayParser.test.cc +++ b/senf/Packets/ArrayParser.test.cc @@ -29,7 +29,7 @@ // Custom includes #include "Packets.hh" -#include "../Utils/auto_unit_test.hh" +#include #include #define prefix_ diff --git a/senf/Packets/AuxParser.test.cc b/senf/Packets/AuxParser.test.cc index ff7aaa2..4aa28d5 100644 --- a/senf/Packets/AuxParser.test.cc +++ b/senf/Packets/AuxParser.test.cc @@ -29,7 +29,7 @@ // Custom includes #include "Packets.hh" -#include "../Utils/auto_unit_test.hh" +#include #include #define prefix_ diff --git a/senf/Packets/DefaultBundle/EthernetPacket.hh b/senf/Packets/DefaultBundle/EthernetPacket.hh index 51a2389..70c769d 100644 --- a/senf/Packets/DefaultBundle/EthernetPacket.hh +++ b/senf/Packets/DefaultBundle/EthernetPacket.hh @@ -28,8 +28,8 @@ // Custom includes #include -#include "../../Socket/Protocols/Raw/MACAddress.hh" -#include "../../Packets/Packets.hh" +#include +#include //#include "EthernetPacket.mpp" ///////////////////////////////hh.p//////////////////////////////////////// diff --git a/senf/Packets/DefaultBundle/EthernetPacket.test.cc b/senf/Packets/DefaultBundle/EthernetPacket.test.cc index f3dca00..656bcc4 100644 --- a/senf/Packets/DefaultBundle/EthernetPacket.test.cc +++ b/senf/Packets/DefaultBundle/EthernetPacket.test.cc @@ -31,7 +31,7 @@ #include "LlcSnapPacket.hh" #include "IPv4Packet.hh" -#include "../../Utils/auto_unit_test.hh" +#include #include #define prefix_ diff --git a/senf/Packets/DefaultBundle/ICMPv6Packet.cc b/senf/Packets/DefaultBundle/ICMPv6Packet.cc index 66072db..42a48bd 100644 --- a/senf/Packets/DefaultBundle/ICMPv6Packet.cc +++ b/senf/Packets/DefaultBundle/ICMPv6Packet.cc @@ -28,8 +28,8 @@ // Custom includes #include -#include "../../Packets/DefaultBundle/IPv6Packet.hh" -#include "../../Utils/IpChecksum.hh" +#include +#include #define prefix_ ///////////////////////////////cc.p//////////////////////////////////////// diff --git a/senf/Packets/DefaultBundle/ICMPv6Packet.hh b/senf/Packets/DefaultBundle/ICMPv6Packet.hh index bc7d9c2..0c8586b 100644 --- a/senf/Packets/DefaultBundle/ICMPv6Packet.hh +++ b/senf/Packets/DefaultBundle/ICMPv6Packet.hh @@ -27,7 +27,7 @@ #define HH_SENF_Packets_DefaultBundle_ICMPv6Packet_ 1 // Custom includes -#include "../../Packets/Packets.hh" +#include //#include "ICMPv6Packet.mpp" ///////////////////////////////hh.p//////////////////////////////////////// diff --git a/senf/Packets/DefaultBundle/ICMPv6Packet.test.cc b/senf/Packets/DefaultBundle/ICMPv6Packet.test.cc index a1b9b8c..9402d96 100644 --- a/senf/Packets/DefaultBundle/ICMPv6Packet.test.cc +++ b/senf/Packets/DefaultBundle/ICMPv6Packet.test.cc @@ -27,7 +27,7 @@ #include "ICMPv6Packet.hh" #include "ICMPv6TypePacket.hh" -#include "../../Utils/auto_unit_test.hh" +#include #include diff --git a/senf/Packets/DefaultBundle/ICMPv6TypePacket.cc b/senf/Packets/DefaultBundle/ICMPv6TypePacket.cc index 520bb55..0cb9b3b 100644 --- a/senf/Packets/DefaultBundle/ICMPv6TypePacket.cc +++ b/senf/Packets/DefaultBundle/ICMPv6TypePacket.cc @@ -23,7 +23,7 @@ // Definition of non-inline non-template functions // Custom includes -#include "../../Packets/Packets.hh" +#include #include "ICMPv6Packet.hh" #include "ICMPv6TypePacket.hh" diff --git a/senf/Packets/DefaultBundle/ICMPv6TypePacket.hh b/senf/Packets/DefaultBundle/ICMPv6TypePacket.hh index 25af18e..a87ad56 100644 --- a/senf/Packets/DefaultBundle/ICMPv6TypePacket.hh +++ b/senf/Packets/DefaultBundle/ICMPv6TypePacket.hh @@ -26,7 +26,7 @@ #define HH_SENF_Packets_DefaultBundle_ICMPv6TypePacket_ 1 // Custom includes -#include "../Packets.hh" +#include #include "IPv6Packet.hh" #include "ICMPv6Packet.hh" diff --git a/senf/Packets/DefaultBundle/IPv4Packet.cc b/senf/Packets/DefaultBundle/IPv4Packet.cc index 131649c..3268575 100644 --- a/senf/Packets/DefaultBundle/IPv4Packet.cc +++ b/senf/Packets/DefaultBundle/IPv4Packet.cc @@ -32,7 +32,7 @@ #include #include #include -#include "../../Utils/IpChecksum.hh" +#include #include "EthernetPacket.hh" #define prefix_ diff --git a/senf/Packets/DefaultBundle/IPv4Packet.hh b/senf/Packets/DefaultBundle/IPv4Packet.hh index 0cdae50..259a815 100644 --- a/senf/Packets/DefaultBundle/IPv4Packet.hh +++ b/senf/Packets/DefaultBundle/IPv4Packet.hh @@ -27,8 +27,8 @@ #define HH_SENF_Packets_DefaultBundle_IPv4Packet_ 1 // Custom includes -#include "../../Socket/Protocols/INet/INet4Address.hh" -#include "../../Packets/Packets.hh" +#include +#include //#include "IPv4Packet.mpp" ///////////////////////////////hh.p//////////////////////////////////////// diff --git a/senf/Packets/DefaultBundle/IPv4Packet.test.cc b/senf/Packets/DefaultBundle/IPv4Packet.test.cc index a93e631..8fee50b 100644 --- a/senf/Packets/DefaultBundle/IPv4Packet.test.cc +++ b/senf/Packets/DefaultBundle/IPv4Packet.test.cc @@ -30,7 +30,7 @@ #include "IPv4Packet.hh" #include "UDPPacket.hh" -#include "../../Utils/auto_unit_test.hh" +#include #include #define prefix_ diff --git a/senf/Packets/DefaultBundle/IPv6Extensions.test.cc b/senf/Packets/DefaultBundle/IPv6Extensions.test.cc index beb8c79..4fcd159 100644 --- a/senf/Packets/DefaultBundle/IPv6Extensions.test.cc +++ b/senf/Packets/DefaultBundle/IPv6Extensions.test.cc @@ -32,7 +32,7 @@ #include "UDPPacket.hh" #include "ICMPv6Packet.hh" -#include "../../Utils/auto_unit_test.hh" +#include #include #define prefix_ diff --git a/senf/Packets/DefaultBundle/IPv6Packet.hh b/senf/Packets/DefaultBundle/IPv6Packet.hh index c8a06d5..7fecab5 100644 --- a/senf/Packets/DefaultBundle/IPv6Packet.hh +++ b/senf/Packets/DefaultBundle/IPv6Packet.hh @@ -27,8 +27,8 @@ #define HH_SENF_Packets_DefaultBundle_IPv6Packet_ 1 // Custom includes -#include "../../Socket/Protocols/INet/INet6Address.hh" -#include "../../Packets/Packets.hh" +#include +#include #include "IPv4Packet.hh" //#include "IPv6Packet.mpp" diff --git a/senf/Packets/DefaultBundle/IPv6Packet.test.cc b/senf/Packets/DefaultBundle/IPv6Packet.test.cc index b3f2711..07d7c0a 100644 --- a/senf/Packets/DefaultBundle/IPv6Packet.test.cc +++ b/senf/Packets/DefaultBundle/IPv6Packet.test.cc @@ -28,10 +28,10 @@ // Custom includes #include "IPv6Packet.hh" -#include "../../Socket/Protocols/INet/INetAddressing.hh" -#include "../../Packets/DataPacket.hh" +#include +#include -#include "../../Utils/auto_unit_test.hh" +#include #include #define prefix_ diff --git a/senf/Packets/DefaultBundle/LlcSnapPacket.hh b/senf/Packets/DefaultBundle/LlcSnapPacket.hh index 33c0069..115a4a2 100644 --- a/senf/Packets/DefaultBundle/LlcSnapPacket.hh +++ b/senf/Packets/DefaultBundle/LlcSnapPacket.hh @@ -29,7 +29,7 @@ // Custom includes #include #include "EthernetPacket.hh" -#include "../../Packets/Packets.hh" +#include //#include "LlcSnapPacket.mpp" ///////////////////////////////hh.p//////////////////////////////////////// diff --git a/senf/Packets/DefaultBundle/LlcSnapPacket.test.cc b/senf/Packets/DefaultBundle/LlcSnapPacket.test.cc index 37890c9..c50174e 100644 --- a/senf/Packets/DefaultBundle/LlcSnapPacket.test.cc +++ b/senf/Packets/DefaultBundle/LlcSnapPacket.test.cc @@ -30,7 +30,7 @@ #include "LlcSnapPacket.hh" #include "EthernetPacket.hh" -#include "../../Utils/auto_unit_test.hh" +#include #include #define prefix_ diff --git a/senf/Packets/DefaultBundle/Mldv2Packet.test.cc b/senf/Packets/DefaultBundle/Mldv2Packet.test.cc index f42a48f..7702be1 100644 --- a/senf/Packets/DefaultBundle/Mldv2Packet.test.cc +++ b/senf/Packets/DefaultBundle/Mldv2Packet.test.cc @@ -26,10 +26,10 @@ #include "ICMPv6Packet.hh" #include "ICMPv6TypePacket.hh" -#include "../../Packets/DataPacket.hh" -#include "../../Utils/String.hh" +#include +#include -#include "../../Utils/auto_unit_test.hh" +#include #include diff --git a/senf/Packets/DefaultBundle/RTPPacket.hh b/senf/Packets/DefaultBundle/RTPPacket.hh index 403d994..c588ab9 100644 --- a/senf/Packets/DefaultBundle/RTPPacket.hh +++ b/senf/Packets/DefaultBundle/RTPPacket.hh @@ -27,8 +27,8 @@ #ifndef HH_SENF_Packets_DefaultBundle_RTPPacket_ #define HH_SENF_Packets_DefaultBundle_RTPPacket_ -#include "../../Packets/Packets.hh" -#include "../../Socket/Protocols/INet/INet6Address.hh" +#include +#include namespace senf { diff --git a/senf/Packets/DefaultBundle/RTPPacket.test.cc b/senf/Packets/DefaultBundle/RTPPacket.test.cc index 04ee7aa..9598a03 100644 --- a/senf/Packets/DefaultBundle/RTPPacket.test.cc +++ b/senf/Packets/DefaultBundle/RTPPacket.test.cc @@ -26,7 +26,7 @@ // Custom includes #include "RTPPacket.hh" -#include "../../Utils/auto_unit_test.hh" +#include #include diff --git a/senf/Packets/DefaultBundle/TCPPacket.cc b/senf/Packets/DefaultBundle/TCPPacket.cc index fb10044..60b4beb 100644 --- a/senf/Packets/DefaultBundle/TCPPacket.cc +++ b/senf/Packets/DefaultBundle/TCPPacket.cc @@ -29,8 +29,8 @@ // Custom includes #include #include -#include "../../Packets/Packets.hh" -#include "../../Utils/IpChecksum.hh" +#include +#include #include "IPv4Packet.hh" #include "IPv6Packet.hh" diff --git a/senf/Packets/DefaultBundle/TCPPacket.hh b/senf/Packets/DefaultBundle/TCPPacket.hh index 2f960b1..f2f9038 100644 --- a/senf/Packets/DefaultBundle/TCPPacket.hh +++ b/senf/Packets/DefaultBundle/TCPPacket.hh @@ -27,7 +27,7 @@ #define HH_SENF_Packets_DefaultBundle_TCPPacket_ 1 // Custom includes -#include "../../Packets/Packets.hh" +#include //#include "TCPPacket.mpp" ///////////////////////////////hh.p//////////////////////////////////////// diff --git a/senf/Packets/DefaultBundle/TCPPacket.test.cc b/senf/Packets/DefaultBundle/TCPPacket.test.cc index 70ada0c..b37fef6 100644 --- a/senf/Packets/DefaultBundle/TCPPacket.test.cc +++ b/senf/Packets/DefaultBundle/TCPPacket.test.cc @@ -31,7 +31,7 @@ #include "IPv4Packet.hh" #include "IPv6Packet.hh" -#include "../../Utils/auto_unit_test.hh" +#include #include #define prefix_ diff --git a/senf/Packets/DefaultBundle/UDPPacket.cc b/senf/Packets/DefaultBundle/UDPPacket.cc index a985f24..33065ea 100644 --- a/senf/Packets/DefaultBundle/UDPPacket.cc +++ b/senf/Packets/DefaultBundle/UDPPacket.cc @@ -29,8 +29,8 @@ // Custom includes #include #include -#include "../../Packets/Packets.hh" -#include "../../Utils/IpChecksum.hh" +#include +#include #include "IPv4Packet.hh" #include "IPv6Packet.hh" diff --git a/senf/Packets/DefaultBundle/UDPPacket.hh b/senf/Packets/DefaultBundle/UDPPacket.hh index 456b325..e03408f 100644 --- a/senf/Packets/DefaultBundle/UDPPacket.hh +++ b/senf/Packets/DefaultBundle/UDPPacket.hh @@ -27,7 +27,7 @@ #define HH_SENF_Packets_DefaultBundle_UDPPacket_ 1 // Custom includes -#include "../../Packets/Packets.hh" +#include //#include "UDPPacket.mpp" ///////////////////////////////hh.p//////////////////////////////////////// diff --git a/senf/Packets/DefaultBundle/UDPPacket.test.cc b/senf/Packets/DefaultBundle/UDPPacket.test.cc index ad47d32..29e6826 100644 --- a/senf/Packets/DefaultBundle/UDPPacket.test.cc +++ b/senf/Packets/DefaultBundle/UDPPacket.test.cc @@ -31,7 +31,7 @@ #include "IPv4Packet.hh" #include "IPv6Packet.hh" -#include "../../Utils/auto_unit_test.hh" +#include #include #define prefix_ diff --git a/senf/Packets/DefaultBundle/extra_tests/PacketLink.test.cc b/senf/Packets/DefaultBundle/extra_tests/PacketLink.test.cc index d5bc380..4cdf0e8 100644 --- a/senf/Packets/DefaultBundle/extra_tests/PacketLink.test.cc +++ b/senf/Packets/DefaultBundle/extra_tests/PacketLink.test.cc @@ -27,10 +27,10 @@ //#include "PacketLink.test.ih" // Custom includes -#include "../EthernetPacket.hh" -#include "../IPv6Packet.hh" +#include +#include -#include "../../../Utils/auto_unit_test.hh" +#include #include #define prefix_ diff --git a/senf/Packets/DefaultBundle/extra_tests/main.test.cc b/senf/Packets/DefaultBundle/extra_tests/main.test.cc index 190483a..9f91d17 100644 --- a/senf/Packets/DefaultBundle/extra_tests/main.test.cc +++ b/senf/Packets/DefaultBundle/extra_tests/main.test.cc @@ -27,7 +27,7 @@ // Custom includes #define BOOST_AUTO_TEST_MAIN -#include "../../../Utils/auto_unit_test.hh" +#include #include #define prefix_ diff --git a/senf/Packets/DefaultBundle/main.test.cc b/senf/Packets/DefaultBundle/main.test.cc index 204a84c..c44a8c0 100644 --- a/senf/Packets/DefaultBundle/main.test.cc +++ b/senf/Packets/DefaultBundle/main.test.cc @@ -27,7 +27,7 @@ // Custom includes #define BOOST_AUTO_TEST_MAIN -#include "../../Utils/auto_unit_test.hh" +#include #include #define prefix_ diff --git a/senf/Packets/IntParser.test.cc b/senf/Packets/IntParser.test.cc index 1cf05ab..b54908d 100644 --- a/senf/Packets/IntParser.test.cc +++ b/senf/Packets/IntParser.test.cc @@ -29,7 +29,7 @@ // Custom includes #include "Packets.hh" -#include "../Utils/auto_unit_test.hh" +#include #include #define prefix_ diff --git a/senf/Packets/ListBParser.test.cc b/senf/Packets/ListBParser.test.cc index d1fc125..23a14ff 100644 --- a/senf/Packets/ListBParser.test.cc +++ b/senf/Packets/ListBParser.test.cc @@ -29,7 +29,7 @@ // Custom includes #include "Packets.hh" -#include "../Utils/auto_unit_test.hh" +#include #include #define prefix_ diff --git a/senf/Packets/ListNParser.ct b/senf/Packets/ListNParser.ct index 5b19099..0ccd811 100644 --- a/senf/Packets/ListNParser.ct +++ b/senf/Packets/ListNParser.ct @@ -26,7 +26,7 @@ #include "ListNParser.ih" // Custom includes -#include "../Utils/senfassert.hh" +#include #define prefix_ ///////////////////////////////ct.p//////////////////////////////////////// diff --git a/senf/Packets/ListNParser.test.cc b/senf/Packets/ListNParser.test.cc index 4d356f1..1a592c1 100644 --- a/senf/Packets/ListNParser.test.cc +++ b/senf/Packets/ListNParser.test.cc @@ -29,7 +29,7 @@ // Custom includes #include "Packets.hh" -#include "../Utils/auto_unit_test.hh" +#include #include #define prefix_ diff --git a/senf/Packets/ListParser.ct b/senf/Packets/ListParser.ct index 19fccdb..8a5555e 100644 --- a/senf/Packets/ListParser.ct +++ b/senf/Packets/ListParser.ct @@ -26,7 +26,7 @@ #include "ListParser.ih" // Custom includes -#include "../Utils/senfassert.hh" +#include #define prefix_ ///////////////////////////////ct.p//////////////////////////////////////// diff --git a/senf/Packets/ListParser.cti b/senf/Packets/ListParser.cti index 9847a65..a16ed88 100644 --- a/senf/Packets/ListParser.cti +++ b/senf/Packets/ListParser.cti @@ -26,7 +26,7 @@ #include "ListParser.ih" // Custom includes -#include "../Utils/senfassert.hh" +#include #define prefix_ inline ///////////////////////////////cti.p/////////////////////////////////////// diff --git a/senf/Packets/ListParser.test.cc b/senf/Packets/ListParser.test.cc index 8f82c66..f2a8276 100644 --- a/senf/Packets/ListParser.test.cc +++ b/senf/Packets/ListParser.test.cc @@ -29,7 +29,7 @@ // Custom includes #include "Packets.hh" -#include "../Utils/auto_unit_test.hh" +#include #include #define prefix_ diff --git a/senf/Packets/MPEGDVBBundle/DTCPPacket.hh b/senf/Packets/MPEGDVBBundle/DTCPPacket.hh index 78f226f..f5bdbe2 100644 --- a/senf/Packets/MPEGDVBBundle/DTCPPacket.hh +++ b/senf/Packets/MPEGDVBBundle/DTCPPacket.hh @@ -27,9 +27,9 @@ #define HH_SENF_Packets_MPEGDVBBundle_DTCPPacket_ 1 // Custom includes -#include "../../Packets/Packets.hh" -#include "../../Packets/DefaultBundle/IPv4Packet.hh" -#include "../../Packets/DefaultBundle/IPv6Packet.hh" +#include +#include +#include //#include "DTCPPacket.mpp" ///////////////////////////////hh.p//////////////////////////////////////// diff --git a/senf/Packets/MPEGDVBBundle/DTCPPacket.test.cc b/senf/Packets/MPEGDVBBundle/DTCPPacket.test.cc index 16df352..e13aad5 100644 --- a/senf/Packets/MPEGDVBBundle/DTCPPacket.test.cc +++ b/senf/Packets/MPEGDVBBundle/DTCPPacket.test.cc @@ -28,9 +28,9 @@ // Custom includes #include "DTCPPacket.hh" -#include "../../Utils/String.hh" +#include -#include "../../Utils/auto_unit_test.hh" +#include #include #define prefix_ diff --git a/senf/Packets/MPEGDVBBundle/GREPacket.hh b/senf/Packets/MPEGDVBBundle/GREPacket.hh index 32b8c11..99434a2 100644 --- a/senf/Packets/MPEGDVBBundle/GREPacket.hh +++ b/senf/Packets/MPEGDVBBundle/GREPacket.hh @@ -28,8 +28,8 @@ // Custom includes #include -#include "../../Packets/Packets.hh" -#include "../DefaultBundle/EthernetPacket.hh" +#include +#include //#include "GREPacket.mpp" ///////////////////////////////hh.p//////////////////////////////////////// diff --git a/senf/Packets/MPEGDVBBundle/GREPacket.test.cc b/senf/Packets/MPEGDVBBundle/GREPacket.test.cc index c3481fa..a662ba6 100644 --- a/senf/Packets/MPEGDVBBundle/GREPacket.test.cc +++ b/senf/Packets/MPEGDVBBundle/GREPacket.test.cc @@ -29,7 +29,7 @@ // Custom includes #include "GREPacket.hh" -#include "../../Utils/auto_unit_test.hh" +#include #include #define prefix_ diff --git a/senf/Packets/MPEGDVBBundle/MPESection.cc b/senf/Packets/MPEGDVBBundle/MPESection.cc index 0130ba7..44b4cf6 100644 --- a/senf/Packets/MPEGDVBBundle/MPESection.cc +++ b/senf/Packets/MPEGDVBBundle/MPESection.cc @@ -29,9 +29,9 @@ // Custom includes #include #include -#include "../../Packets/DefaultBundle/LlcSnapPacket.hh" -#include "../../Packets/DefaultBundle/IPv4Packet.hh" -#include "../../Packets/DefaultBundle/IPv6Packet.hh" +#include +#include +#include #define prefix_ ///////////////////////////////cc.p//////////////////////////////////////// diff --git a/senf/Packets/MPEGDVBBundle/MPESection.hh b/senf/Packets/MPEGDVBBundle/MPESection.hh index 5b80e05..12782e1 100644 --- a/senf/Packets/MPEGDVBBundle/MPESection.hh +++ b/senf/Packets/MPEGDVBBundle/MPESection.hh @@ -29,7 +29,7 @@ // Custom includes #include #include -#include "../../Packets/Packets.hh" +#include //#include "MPESection.mpp" ///////////////////////////////hh.p//////////////////////////////////////// diff --git a/senf/Packets/MPEGDVBBundle/MPESection.test.cc b/senf/Packets/MPEGDVBBundle/MPESection.test.cc index 66bca28..1bf368a 100644 --- a/senf/Packets/MPEGDVBBundle/MPESection.test.cc +++ b/senf/Packets/MPEGDVBBundle/MPESection.test.cc @@ -28,11 +28,11 @@ // Custom includes #include "MPESection.hh" -#include "../../Packets/DefaultBundle/LlcSnapPacket.hh" -#include "../../Packets/DefaultBundle/EthernetPacket.hh" -#include "../../Packets/DefaultBundle/IPv4Packet.hh" +#include +#include +#include -#include "../../Utils/auto_unit_test.hh" +#include #include #define prefix_ diff --git a/senf/Packets/MPEGDVBBundle/SNDUPacket.cc b/senf/Packets/MPEGDVBBundle/SNDUPacket.cc index 9590310..a034f7b 100644 --- a/senf/Packets/MPEGDVBBundle/SNDUPacket.cc +++ b/senf/Packets/MPEGDVBBundle/SNDUPacket.cc @@ -28,8 +28,8 @@ // Custom includes #include -#include "../../Utils/hexdump.hh" -#include "../../Packets/DefaultBundle/EthernetPacket.hh" +#include +#include #define prefix_ diff --git a/senf/Packets/MPEGDVBBundle/SNDUPacket.hh b/senf/Packets/MPEGDVBBundle/SNDUPacket.hh index 1b69912..e700942 100644 --- a/senf/Packets/MPEGDVBBundle/SNDUPacket.hh +++ b/senf/Packets/MPEGDVBBundle/SNDUPacket.hh @@ -29,8 +29,8 @@ // Custom includes #include #include -#include "../../Packets/Packets.hh" -#include "../DefaultBundle/EthernetPacket.hh" +#include +#include //#include "SNDUPacket.mpp" ///////////////////////////////hh.p//////////////////////////////////////// diff --git a/senf/Packets/MPEGDVBBundle/TransportPacket.hh b/senf/Packets/MPEGDVBBundle/TransportPacket.hh index 38200d5..dddad47 100644 --- a/senf/Packets/MPEGDVBBundle/TransportPacket.hh +++ b/senf/Packets/MPEGDVBBundle/TransportPacket.hh @@ -27,7 +27,7 @@ #define HH_SENF_Packets_MPEGDVBBundle_TransportPacket_ 1 // Custom includes -#include "../../Packets/Packets.hh" +#include //#include "TransportPacket.mpp" ///////////////////////////////hh.p//////////////////////////////////////// diff --git a/senf/Packets/MPEGDVBBundle/TransportPacket.test.cc b/senf/Packets/MPEGDVBBundle/TransportPacket.test.cc index 50b2377..3f1df1a 100644 --- a/senf/Packets/MPEGDVBBundle/TransportPacket.test.cc +++ b/senf/Packets/MPEGDVBBundle/TransportPacket.test.cc @@ -29,7 +29,7 @@ // Custom includes #include "TransportPacket.hh" -#include "../../Utils/auto_unit_test.hh" +#include #include #define prefix_ diff --git a/senf/Packets/MPEGDVBBundle/main.test.cc b/senf/Packets/MPEGDVBBundle/main.test.cc index db20752..8336519 100644 --- a/senf/Packets/MPEGDVBBundle/main.test.cc +++ b/senf/Packets/MPEGDVBBundle/main.test.cc @@ -27,7 +27,7 @@ // Custom includes #define BOOST_AUTO_TEST_MAIN -#include "../../Utils/auto_unit_test.hh" +#include #include #define prefix_ diff --git a/senf/Packets/Packet.cci b/senf/Packets/Packet.cci index 6e9d735..862c04c 100644 --- a/senf/Packets/Packet.cci +++ b/senf/Packets/Packet.cci @@ -24,7 +24,7 @@ \brief Packet inline non-template implementation */ // Custom includes -#include "../Utils/senfassert.hh" +#include #define prefix_ inline ///////////////////////////////cci.p/////////////////////////////////////// diff --git a/senf/Packets/Packet.cti b/senf/Packets/Packet.cti index afae606..8e56512 100644 --- a/senf/Packets/Packet.cti +++ b/senf/Packets/Packet.cti @@ -26,7 +26,7 @@ //#include "Packet.ih" // Custom includes -#include "../Utils/Exception.hh" +#include #define prefix_ inline ///////////////////////////////cti.p/////////////////////////////////////// diff --git a/senf/Packets/Packet.hh b/senf/Packets/Packet.hh index ff3daa8..57a0f21 100644 --- a/senf/Packets/Packet.hh +++ b/senf/Packets/Packet.hh @@ -30,9 +30,9 @@ #include #include #include -#include "../Utils/Exception.hh" -#include "../Utils/Tags.hh" -#include "../Utils/safe_bool.hh" +#include +#include +#include #include "PacketInterpreter.hh" //#include "Packet.mpp" diff --git a/senf/Packets/Packet.test.cc b/senf/Packets/Packet.test.cc index 6aecfbe..84ba3f1 100644 --- a/senf/Packets/Packet.test.cc +++ b/senf/Packets/Packet.test.cc @@ -31,7 +31,7 @@ #include #include "Packets.hh" -#include "../Utils/auto_unit_test.hh" +#include #include #define prefix_ diff --git a/senf/Packets/PacketData.cci b/senf/Packets/PacketData.cci index 73719c5..7cc1ace 100644 --- a/senf/Packets/PacketData.cci +++ b/senf/Packets/PacketData.cci @@ -24,7 +24,7 @@ \brief PacketData inline non-template implementation */ // Custom includes -#include "../Utils/senfassert.hh" +#include #include #include "PacketImpl.hh" // #include "PacketParser.hh" diff --git a/senf/Packets/PacketData.hh b/senf/Packets/PacketData.hh index 05e5aa8..9af6643 100644 --- a/senf/Packets/PacketData.hh +++ b/senf/Packets/PacketData.hh @@ -29,8 +29,8 @@ // Custom includes #include #include -#include "../Utils/safe_bool.hh" -#include "../Utils/Exception.hh" +#include +#include #include "PacketTypes.hh" //#include "PacketData.mpp" diff --git a/senf/Packets/PacketData.test.cc b/senf/Packets/PacketData.test.cc index 76806f6..2a26865 100644 --- a/senf/Packets/PacketData.test.cc +++ b/senf/Packets/PacketData.test.cc @@ -29,7 +29,7 @@ // Custom includes #include "Packets.hh" -#include "../Utils/auto_unit_test.hh" +#include #include #define prefix_ diff --git a/senf/Packets/PacketImpl.cci b/senf/Packets/PacketImpl.cci index 3c6cce0..690414f 100644 --- a/senf/Packets/PacketImpl.cci +++ b/senf/Packets/PacketImpl.cci @@ -24,7 +24,7 @@ \brief PacketImpl inline non-template implementation */ // Custom includes -#include "../Utils/senfassert.hh" +#include // #include "PacketInterpreter.hh" #define prefix_ inline diff --git a/senf/Packets/PacketImpl.hh b/senf/Packets/PacketImpl.hh index 0ad1e77..e0ab170 100644 --- a/senf/Packets/PacketImpl.hh +++ b/senf/Packets/PacketImpl.hh @@ -34,9 +34,9 @@ #include #include #include -#include "../Utils/pool_alloc_mixin.hh" +#include #include "PacketTypes.hh" -#include "../Utils/singleton.hh" +#include //#include "PacketImpl.mpp" ///////////////////////////////hh.p//////////////////////////////////////// diff --git a/senf/Packets/PacketImpl.test.cc b/senf/Packets/PacketImpl.test.cc index 649bd0f..13db554 100644 --- a/senf/Packets/PacketImpl.test.cc +++ b/senf/Packets/PacketImpl.test.cc @@ -30,7 +30,7 @@ #include "Packets.hh" #include "main.test.hh" -#include "../Utils/auto_unit_test.hh" +#include #include #define prefix_ diff --git a/senf/Packets/PacketInterpreter.cci b/senf/Packets/PacketInterpreter.cci index c5c75d3..fef8049 100644 --- a/senf/Packets/PacketInterpreter.cci +++ b/senf/Packets/PacketInterpreter.cci @@ -24,7 +24,7 @@ \brief PacketInterpreter inline non-template implementation */ // Custom includes -#include "../Utils/senfassert.hh" +#include #include #define prefix_ inline diff --git a/senf/Packets/PacketInterpreter.hh b/senf/Packets/PacketInterpreter.hh index 490d853..5747c94 100644 --- a/senf/Packets/PacketInterpreter.hh +++ b/senf/Packets/PacketInterpreter.hh @@ -30,11 +30,11 @@ #include #include #include -#include "../Utils/intrusive_refcount.hh" -#include "../Utils/pool_alloc_mixin.hh" -#include "../Utils/Tags.hh" +#include +#include +#include #include "PacketData.hh" -#include "../Utils/TypeIdValue.hh" +#include //#include "PacketInterpreter.mpp" ///////////////////////////////hh.p//////////////////////////////////////// diff --git a/senf/Packets/PacketInterpreter.test.cc b/senf/Packets/PacketInterpreter.test.cc index 8e8d8c2..6d4172a 100644 --- a/senf/Packets/PacketInterpreter.test.cc +++ b/senf/Packets/PacketInterpreter.test.cc @@ -29,7 +29,7 @@ // Custom includes #include "Packets.hh" -#include "../Utils/auto_unit_test.hh" +#include #include #define prefix_ diff --git a/senf/Packets/PacketParser.cti b/senf/Packets/PacketParser.cti index 098908f..abbc3d7 100644 --- a/senf/Packets/PacketParser.cti +++ b/senf/Packets/PacketParser.cti @@ -26,7 +26,7 @@ #include "PacketParser.ih" // Custom includes -#include "../Utils/senfassert.hh" +#include #include "PacketData.hh" #define prefix_ inline diff --git a/senf/Packets/PacketParser.hh b/senf/Packets/PacketParser.hh index b5ef0ea..e22bf18 100644 --- a/senf/Packets/PacketParser.hh +++ b/senf/Packets/PacketParser.hh @@ -157,7 +157,7 @@ #include #include #include -#include "../Utils/safe_bool.hh" +#include #include "PacketTypes.hh" #include "PacketData.hh" #include "ParseHelpers.hh" diff --git a/senf/Packets/PacketParser.ih b/senf/Packets/PacketParser.ih index 00df8a8..a44fe83 100644 --- a/senf/Packets/PacketParser.ih +++ b/senf/Packets/PacketParser.ih @@ -27,7 +27,7 @@ #define IH_SENF_Packets_PacketParser_ 1 // Custom includes -#include "../Utils/mpl.hh" +#include ///////////////////////////////ih.p//////////////////////////////////////// diff --git a/senf/Packets/PacketParser.test.cc b/senf/Packets/PacketParser.test.cc index 0a120b9..da482ff 100644 --- a/senf/Packets/PacketParser.test.cc +++ b/senf/Packets/PacketParser.test.cc @@ -29,7 +29,7 @@ // Custom includes #include "Packets.hh" -#include "../Utils/auto_unit_test.hh" +#include #include #define prefix_ diff --git a/senf/Packets/PacketRegistry.ct b/senf/Packets/PacketRegistry.ct index ab0de44..4d82e36 100644 --- a/senf/Packets/PacketRegistry.ct +++ b/senf/Packets/PacketRegistry.ct @@ -26,9 +26,9 @@ #include "PacketRegistry.ih" // Custom includes -#include "../Utils/senfassert.hh" +#include #include -#include "../Utils/TypeInfo.hh" +#include #define prefix_ ///////////////////////////////ct.p//////////////////////////////////////// diff --git a/senf/Packets/PacketRegistry.hh b/senf/Packets/PacketRegistry.hh index 2311f3e..932dfec 100644 --- a/senf/Packets/PacketRegistry.hh +++ b/senf/Packets/PacketRegistry.hh @@ -31,7 +31,7 @@ #include // for boost::noncopyable #include #include -#include "../Utils/Exception.hh" +#include #include "Packet.hh" #include "PacketRegistry.ih" diff --git a/senf/Packets/PacketRegistry.ih b/senf/Packets/PacketRegistry.ih index af16278..24c9851 100644 --- a/senf/Packets/PacketRegistry.ih +++ b/senf/Packets/PacketRegistry.ih @@ -30,7 +30,7 @@ #include #include #include -#include "../Utils/TypeIdValue.hh" +#include ///////////////////////////////ih.p//////////////////////////////////////// diff --git a/senf/Packets/PacketRegistry.test.cc b/senf/Packets/PacketRegistry.test.cc index a30c8fb..b9244c6 100644 --- a/senf/Packets/PacketRegistry.test.cc +++ b/senf/Packets/PacketRegistry.test.cc @@ -31,7 +31,7 @@ #include #include "Packets.hh" -#include "../Utils/auto_unit_test.hh" +#include #include #define prefix_ diff --git a/senf/Packets/ParseHelpers.test.cc b/senf/Packets/ParseHelpers.test.cc index b5a5f22..c0f04d5 100644 --- a/senf/Packets/ParseHelpers.test.cc +++ b/senf/Packets/ParseHelpers.test.cc @@ -29,7 +29,7 @@ // Custom includes #include "Packets.hh" -#include "../Utils/auto_unit_test.hh" +#include #include #define prefix_ diff --git a/senf/Packets/SafeIterator.test.cc b/senf/Packets/SafeIterator.test.cc index 171f834..bd8a77b 100644 --- a/senf/Packets/SafeIterator.test.cc +++ b/senf/Packets/SafeIterator.test.cc @@ -29,7 +29,7 @@ // Custom includes #include "Packets.hh" -#include "../Utils/auto_unit_test.hh" +#include #include #define prefix_ diff --git a/senf/Packets/StringParser.test.cc b/senf/Packets/StringParser.test.cc index 6845299..c9590fc 100644 --- a/senf/Packets/StringParser.test.cc +++ b/senf/Packets/StringParser.test.cc @@ -29,7 +29,7 @@ // Custom includes #include "Packets.hh" -#include "../Utils/auto_unit_test.hh" +#include #include #define prefix_ diff --git a/senf/Packets/VariantParser.cti b/senf/Packets/VariantParser.cti index d694cf6..4ae950c 100644 --- a/senf/Packets/VariantParser.cti +++ b/senf/Packets/VariantParser.cti @@ -26,7 +26,7 @@ #include "VariantParser.ih" // Custom includes -#include "../Utils/senfassert.hh" +#include #include #define prefix_ inline diff --git a/senf/Packets/VariantParser.test.cc b/senf/Packets/VariantParser.test.cc index 364349e..02ac3fe 100644 --- a/senf/Packets/VariantParser.test.cc +++ b/senf/Packets/VariantParser.test.cc @@ -29,7 +29,7 @@ // Custom includes #include "Packets.hh" -#include "../Utils/auto_unit_test.hh" +#include #include #define prefix_ diff --git a/senf/Packets/VectorParser.test.cc b/senf/Packets/VectorParser.test.cc index aa554b2..71f415b 100644 --- a/senf/Packets/VectorParser.test.cc +++ b/senf/Packets/VectorParser.test.cc @@ -29,7 +29,7 @@ // Custom includes #include "Packets.hh" -#include "../Utils/auto_unit_test.hh" +#include #include #include diff --git a/senf/Packets/main.test.cc b/senf/Packets/main.test.cc index 015bc67..e785eca 100644 --- a/senf/Packets/main.test.cc +++ b/senf/Packets/main.test.cc @@ -27,7 +27,7 @@ // Custom includes #define BOOST_AUTO_TEST_MAIN -#include "../Utils/auto_unit_test.hh" +#include #include #include "Packets.hh" diff --git a/senf/Scheduler/ClockService.cc b/senf/Scheduler/ClockService.cc index 7754f4c..5a1fb6a 100644 --- a/senf/Scheduler/ClockService.cc +++ b/senf/Scheduler/ClockService.cc @@ -28,7 +28,7 @@ // Custom includes #include -#include "../Utils/Console/Console.hh" +#include //#include "ClockService.mpp" #define prefix_ diff --git a/senf/Scheduler/ClockService.cci b/senf/Scheduler/ClockService.cci index c3a766f..38f353b 100644 --- a/senf/Scheduler/ClockService.cci +++ b/senf/Scheduler/ClockService.cci @@ -26,7 +26,7 @@ // Custom includes #include #include -#include "../Utils/Exception.hh" +#include #define prefix_ inline ///////////////////////////////cci.p/////////////////////////////////////// diff --git a/senf/Scheduler/ClockService.hh b/senf/Scheduler/ClockService.hh index 8fb1341..0dde5c7 100644 --- a/senf/Scheduler/ClockService.hh +++ b/senf/Scheduler/ClockService.hh @@ -32,9 +32,9 @@ #include #include #include -#include "../config.hh" -#include "../Utils/singleton.hh" -#include "../Utils/Console/Parse.hh" +#include +#include +#include //#include "ClockService.mpp" ///////////////////////////////hh.p//////////////////////////////////////// diff --git a/senf/Scheduler/ClockService.test.cc b/senf/Scheduler/ClockService.test.cc index 21b9288..b3fb4a6 100644 --- a/senf/Scheduler/ClockService.test.cc +++ b/senf/Scheduler/ClockService.test.cc @@ -30,7 +30,7 @@ #include "ClockService.hh" #include -#include "../Utils/auto_unit_test.hh" +#include #include #define prefix_ diff --git a/senf/Scheduler/EventHook.ih b/senf/Scheduler/EventHook.ih index 2bed1bb..f430c95 100644 --- a/senf/Scheduler/EventHook.ih +++ b/senf/Scheduler/EventHook.ih @@ -27,7 +27,7 @@ #define IH_SENF_Scheduler_EventHook_ 1 // Custom includes -#include "../Utils/singleton.hh" +#include ///////////////////////////////ih.p//////////////////////////////////////// diff --git a/senf/Scheduler/EventManager.cc b/senf/Scheduler/EventManager.cc index d267a1e..ec4d1be 100644 --- a/senf/Scheduler/EventManager.cc +++ b/senf/Scheduler/EventManager.cc @@ -28,8 +28,8 @@ // Custom includes #include -#include "../Utils/membind.hh" -#include "../Utils/Console/Console.hh" +#include +#include #include "FIFORunner.hh" //#include "EventManager.mpp" diff --git a/senf/Scheduler/EventManager.hh b/senf/Scheduler/EventManager.hh index cd6cb87..729b249 100644 --- a/senf/Scheduler/EventManager.hh +++ b/senf/Scheduler/EventManager.hh @@ -31,8 +31,8 @@ #include #include #include -#include "../Utils/singleton.hh" -#include "../Utils/Console/LazyDirectory.hh" +#include +#include //#include "EventManager.mpp" ///////////////////////////////hh.p//////////////////////////////////////// diff --git a/senf/Scheduler/EventManager.test.cc b/senf/Scheduler/EventManager.test.cc index 0c63ca1..529387f 100644 --- a/senf/Scheduler/EventManager.test.cc +++ b/senf/Scheduler/EventManager.test.cc @@ -32,7 +32,7 @@ #include "TimerEvent.hh" #include "SignalEvent.hh" -#include "../Utils/auto_unit_test.hh" +#include #include #define prefix_ diff --git a/senf/Scheduler/FIFORunner.cc b/senf/Scheduler/FIFORunner.cc index 6ddd914..6b14c94 100644 --- a/senf/Scheduler/FIFORunner.cc +++ b/senf/Scheduler/FIFORunner.cc @@ -30,11 +30,11 @@ #include #include #include -#include "../Utils/Exception.hh" -#include "../Utils/senfassert.hh" -#include "../Utils/ScopeExit.hh" +#include +#include +#include #include -#include "../config.hh" +#include #include //#include "FIFORunner.mpp" diff --git a/senf/Scheduler/FIFORunner.cci b/senf/Scheduler/FIFORunner.cci index 0ddc889..043c7ed 100644 --- a/senf/Scheduler/FIFORunner.cci +++ b/senf/Scheduler/FIFORunner.cci @@ -28,7 +28,7 @@ // Custom includes #ifdef SENF_DEBUG #include -#include "../Utils/Backtrace.hh" +#include #endif #define prefix_ inline diff --git a/senf/Scheduler/FIFORunner.hh b/senf/Scheduler/FIFORunner.hh index 1bfdd16..7f9f655 100644 --- a/senf/Scheduler/FIFORunner.hh +++ b/senf/Scheduler/FIFORunner.hh @@ -31,7 +31,7 @@ #include #include #include -#include "../Utils/singleton.hh" +#include #include "EventManager.hh" //#include "FIFORunner.mpp" diff --git a/senf/Scheduler/FdEvent.cc b/senf/Scheduler/FdEvent.cc index 9cfb410..216fd80 100644 --- a/senf/Scheduler/FdEvent.cc +++ b/senf/Scheduler/FdEvent.cc @@ -28,7 +28,7 @@ // Custom includes #include -#include "../Utils/senfassert.hh" +#include //#include "FdEvent.mpp" #define prefix_ diff --git a/senf/Scheduler/FdEvent.cci b/senf/Scheduler/FdEvent.cci index 9efe737..50256a0 100644 --- a/senf/Scheduler/FdEvent.cci +++ b/senf/Scheduler/FdEvent.cci @@ -26,7 +26,7 @@ #include "FdEvent.ih" // Custom includes -#include "../Utils/senfassert.hh" +#include #include "FdManager.hh" #define prefix_ inline diff --git a/senf/Scheduler/FdEvent.hh b/senf/Scheduler/FdEvent.hh index f4f55da..fed1446 100644 --- a/senf/Scheduler/FdEvent.hh +++ b/senf/Scheduler/FdEvent.hh @@ -28,7 +28,7 @@ // Custom includes #include -#include "../Utils/Exception.hh" +#include #include "FdManager.hh" #include "FIFORunner.hh" diff --git a/senf/Scheduler/FdEvent.test.cc b/senf/Scheduler/FdEvent.test.cc index 865c45a..cfb62db 100644 --- a/senf/Scheduler/FdEvent.test.cc +++ b/senf/Scheduler/FdEvent.test.cc @@ -42,7 +42,7 @@ #include -#include "../Utils/auto_unit_test.hh" +#include #include #define prefix_ diff --git a/senf/Scheduler/FdManager.hh b/senf/Scheduler/FdManager.hh index a87a91c..538acac 100644 --- a/senf/Scheduler/FdManager.hh +++ b/senf/Scheduler/FdManager.hh @@ -29,7 +29,7 @@ // Custom includes #include "Poller.hh" #include "ClockService.hh" -#include "../Utils/singleton.hh" +#include //#include "FdManager.mpp" ///////////////////////////////hh.p//////////////////////////////////////// diff --git a/senf/Scheduler/IdleEvent.ih b/senf/Scheduler/IdleEvent.ih index 4f0728e..2a97a6a 100644 --- a/senf/Scheduler/IdleEvent.ih +++ b/senf/Scheduler/IdleEvent.ih @@ -27,7 +27,7 @@ #define IH_SENF_Scheduler_IdleEvent_ 1 // Custom includes -#include "../Utils/singleton.hh" +#include ///////////////////////////////ih.p//////////////////////////////////////// diff --git a/senf/Scheduler/IdleEvent.test.cc b/senf/Scheduler/IdleEvent.test.cc index d84207d..7507a2c 100644 --- a/senf/Scheduler/IdleEvent.test.cc +++ b/senf/Scheduler/IdleEvent.test.cc @@ -29,7 +29,7 @@ // Custom includes #include "Scheduler.hh" -#include "../Utils/auto_unit_test.hh" +#include #include #define prefix_ diff --git a/senf/Scheduler/Poller.ct b/senf/Scheduler/Poller.ct index 92a13e6..0cd1f07 100644 --- a/senf/Scheduler/Poller.ct +++ b/senf/Scheduler/Poller.ct @@ -27,7 +27,7 @@ // Custom includes #include -#include "../Utils/Exception.hh" +#include #define prefix_ ///////////////////////////////ct.p//////////////////////////////////////// diff --git a/senf/Scheduler/Poller.test.cc b/senf/Scheduler/Poller.test.cc index e40290c..133d840 100644 --- a/senf/Scheduler/Poller.test.cc +++ b/senf/Scheduler/Poller.test.cc @@ -29,7 +29,7 @@ // Custom includes #include "Poller.hh" -#include "../Utils/auto_unit_test.hh" +#include #include #define prefix_ diff --git a/senf/Scheduler/ReadHelper.ct b/senf/Scheduler/ReadHelper.ct index ca4397a..f5a16e1 100644 --- a/senf/Scheduler/ReadHelper.ct +++ b/senf/Scheduler/ReadHelper.ct @@ -25,8 +25,8 @@ // Custom includes #include -#include "../Utils/membind.hh" -#include "../Utils/Exception.hh" +#include +#include #include "Scheduler.hh" #define prefix_ diff --git a/senf/Scheduler/ReadHelper.cti b/senf/Scheduler/ReadHelper.cti index 3af87a6..f018e06 100644 --- a/senf/Scheduler/ReadHelper.cti +++ b/senf/Scheduler/ReadHelper.cti @@ -24,7 +24,7 @@ #include "ReadHelper.ih" // Custom includes -#include "../Utils/Exception.hh" +#include #define prefix_ inline ///////////////////////////////cti.p/////////////////////////////////////// diff --git a/senf/Scheduler/ReadHelper.hh b/senf/Scheduler/ReadHelper.hh index 011b51a..1963a61 100644 --- a/senf/Scheduler/ReadHelper.hh +++ b/senf/Scheduler/ReadHelper.hh @@ -30,7 +30,7 @@ #include #include -#include "../Utils/intrusive_refcount.hh" +#include #include "Scheduler.hh" //#include "ReadHelper.mpp" diff --git a/senf/Scheduler/ReadHelper.test.cc b/senf/Scheduler/ReadHelper.test.cc index 466b4fb..4508046 100644 --- a/senf/Scheduler/ReadHelper.test.cc +++ b/senf/Scheduler/ReadHelper.test.cc @@ -10,7 +10,7 @@ // Custom includes #include "ReadHelper.hh" -#include "../Utils/auto_unit_test.hh" +#include #include #define prefix_ diff --git a/senf/Scheduler/Scheduler.hh b/senf/Scheduler/Scheduler.hh index e1501a7..b722257 100644 --- a/senf/Scheduler/Scheduler.hh +++ b/senf/Scheduler/Scheduler.hh @@ -29,7 +29,7 @@ // Custom includes #include -#include "../Utils/Logger/SenfLog.hh" +#include #include "FdEvent.hh" #include "TimerEvent.hh" #include "SignalEvent.hh" diff --git a/senf/Scheduler/Scheduler.test.cc b/senf/Scheduler/Scheduler.test.cc index 14e01bc..7352830 100644 --- a/senf/Scheduler/Scheduler.test.cc +++ b/senf/Scheduler/Scheduler.test.cc @@ -40,7 +40,7 @@ #include "Scheduler.hh" -#include "../Utils/auto_unit_test.hh" +#include #include #define prefix_ diff --git a/senf/Scheduler/SignalEvent.cc b/senf/Scheduler/SignalEvent.cc index a521bd8..cf6128e 100644 --- a/senf/Scheduler/SignalEvent.cc +++ b/senf/Scheduler/SignalEvent.cc @@ -27,8 +27,8 @@ #include "SignalEvent.ih" // Custom includes -#include "../Utils/senfassert.hh" -#include "../Utils/signalnames.hh" +#include +#include //#include "SignalEvent.mpp" #define prefix_ diff --git a/senf/Scheduler/SignalEvent.cci b/senf/Scheduler/SignalEvent.cci index a19bc4d..5bac1a1 100644 --- a/senf/Scheduler/SignalEvent.cci +++ b/senf/Scheduler/SignalEvent.cci @@ -27,8 +27,8 @@ // Custom includes #include -#include "../Utils/signalnames.hh" -#include "../Utils/senfassert.hh" +#include +#include #define prefix_ inline ///////////////////////////////cci.p/////////////////////////////////////// diff --git a/senf/Scheduler/SignalEvent.ih b/senf/Scheduler/SignalEvent.ih index 29e663c..96f9261 100644 --- a/senf/Scheduler/SignalEvent.ih +++ b/senf/Scheduler/SignalEvent.ih @@ -29,8 +29,8 @@ // Custom includes #include "FdManager.hh" #include -#include "../Utils/Exception.hh" -#include "../Utils/singleton.hh" +#include +#include ///////////////////////////////ih.p//////////////////////////////////////// diff --git a/senf/Scheduler/SignalEvent.test.cc b/senf/Scheduler/SignalEvent.test.cc index d42f720..d45d2e0 100644 --- a/senf/Scheduler/SignalEvent.test.cc +++ b/senf/Scheduler/SignalEvent.test.cc @@ -29,7 +29,7 @@ // Custom includes #include "SignalEvent.hh" -#include "../Utils/auto_unit_test.hh" +#include #include #define prefix_ diff --git a/senf/Scheduler/TimerEvent.hh b/senf/Scheduler/TimerEvent.hh index 1f30611..87b47a2 100644 --- a/senf/Scheduler/TimerEvent.hh +++ b/senf/Scheduler/TimerEvent.hh @@ -32,7 +32,7 @@ #include "ClockService.hh" #include "FdManager.hh" #include "FIFORunner.hh" -#include "../Utils/Logger/SenfLog.hh" +#include //#include "TimerEvent.mpp" ///////////////////////////////hh.p//////////////////////////////////////// diff --git a/senf/Scheduler/TimerEvent.test.cc b/senf/Scheduler/TimerEvent.test.cc index 6a5704a..b45506c 100644 --- a/senf/Scheduler/TimerEvent.test.cc +++ b/senf/Scheduler/TimerEvent.test.cc @@ -31,7 +31,7 @@ #include "Scheduler.hh" #include -#include "../Utils//auto_unit_test.hh" +#include #include #include diff --git a/senf/Scheduler/WriteHelper.ct b/senf/Scheduler/WriteHelper.ct index 3d688ef..fe92ee2 100644 --- a/senf/Scheduler/WriteHelper.ct +++ b/senf/Scheduler/WriteHelper.ct @@ -26,7 +26,7 @@ // Custom includes #include #include -#include "../Utils/Exception.hh" +#include #include "Scheduler.hh" #define prefix_ diff --git a/senf/Scheduler/WriteHelper.cti b/senf/Scheduler/WriteHelper.cti index c67b4d8..9429228 100644 --- a/senf/Scheduler/WriteHelper.cti +++ b/senf/Scheduler/WriteHelper.cti @@ -24,7 +24,7 @@ //#include "WriteHelper.ih" // Custom includes -#include "../Utils/Exception.hh" +#include #define prefix_ inline ///////////////////////////////cti.p/////////////////////////////////////// diff --git a/senf/Scheduler/WriteHelper.hh b/senf/Scheduler/WriteHelper.hh index 3b042a7..407998b 100644 --- a/senf/Scheduler/WriteHelper.hh +++ b/senf/Scheduler/WriteHelper.hh @@ -28,7 +28,7 @@ #include #include #include -#include "../Utils/intrusive_refcount.hh" +#include #include "Scheduler.hh" //#include "WriteHelper.mpp" diff --git a/senf/Scheduler/WriteHelper.test.cc b/senf/Scheduler/WriteHelper.test.cc index b6b4527..526d3f9 100644 --- a/senf/Scheduler/WriteHelper.test.cc +++ b/senf/Scheduler/WriteHelper.test.cc @@ -10,7 +10,7 @@ // Custom includes #include "WriteHelper.hh" -#include "../Utils/auto_unit_test.hh" +#include #include #define prefix_ diff --git a/senf/Scheduler/main.test.cc b/senf/Scheduler/main.test.cc index d2f37be..9f91d17 100644 --- a/senf/Scheduler/main.test.cc +++ b/senf/Scheduler/main.test.cc @@ -27,7 +27,7 @@ // Custom includes #define BOOST_AUTO_TEST_MAIN -#include "../Utils/auto_unit_test.hh" +#include #include #define prefix_ diff --git a/senf/Socket.hh b/senf/Socket.hh index 48e6e36..ff5fd51 100644 --- a/senf/Socket.hh +++ b/senf/Socket.hh @@ -23,7 +23,7 @@ /** \file \brief Socket public header */ -#include "Socket/Socket.hh" +#include // Local Variables: diff --git a/senf/Socket/ClientSocketHandle.ct b/senf/Socket/ClientSocketHandle.ct index c6fa8fd..5fc331f 100644 --- a/senf/Socket/ClientSocketHandle.ct +++ b/senf/Socket/ClientSocketHandle.ct @@ -29,7 +29,7 @@ // Custom includes #include #include -#include "../Utils/Buffer.hh" +#include #define prefix_ ///////////////////////////////ct.p//////////////////////////////////////// diff --git a/senf/Socket/ClientSocketHandle.ih b/senf/Socket/ClientSocketHandle.ih index f752e7b..2d1c6be 100644 --- a/senf/Socket/ClientSocketHandle.ih +++ b/senf/Socket/ClientSocketHandle.ih @@ -27,7 +27,7 @@ #define IH_SENF_Socket_ClientSocketHandle_ 1 // Custom includes -#include "../Utils/IteratorTraits.hh" +#include ///////////////////////////////ih.p//////////////////////////////////////// diff --git a/senf/Socket/ClientSocketHandle.test.cc b/senf/Socket/ClientSocketHandle.test.cc index 7ffbc6b..ed1999d 100644 --- a/senf/Socket/ClientSocketHandle.test.cc +++ b/senf/Socket/ClientSocketHandle.test.cc @@ -32,7 +32,7 @@ #include "ClientSocketHandle.hh" #include "AddressingPolicy.hh" -#include "../Utils/auto_unit_test.hh" +#include #include #define prefix_ diff --git a/senf/Socket/CommunicationPolicy.cc b/senf/Socket/CommunicationPolicy.cc index ef0bba5..295afd4 100644 --- a/senf/Socket/CommunicationPolicy.cc +++ b/senf/Socket/CommunicationPolicy.cc @@ -31,7 +31,7 @@ #include #include #include -#include "../Utils/Exception.hh" +#include #include "ServerSocketHandle.hh" //#include "CommunicationPolicy.mpp" diff --git a/senf/Socket/FileHandle.cc b/senf/Socket/FileHandle.cc index bc8ea9c..ee88f59 100644 --- a/senf/Socket/FileHandle.cc +++ b/senf/Socket/FileHandle.cc @@ -33,7 +33,7 @@ #include #include #include -#include "../Utils/Exception.hh" +#include #define prefix_ ///////////////////////////////cc.p//////////////////////////////////////// diff --git a/senf/Socket/FileHandle.cci b/senf/Socket/FileHandle.cci index 6db39f5..f5fc5de 100644 --- a/senf/Socket/FileHandle.cci +++ b/senf/Socket/FileHandle.cci @@ -27,9 +27,9 @@ //#include "FileHandle.ih" // Custom includes -#include "../Utils/senfassert.hh" +#include #include -#include "../Utils/Exception.hh" +#include #define prefix_ inline ///////////////////////////////cci.p/////////////////////////////////////// diff --git a/senf/Socket/FileHandle.hh b/senf/Socket/FileHandle.hh index 377a8a6..6b9bfb9 100644 --- a/senf/Socket/FileHandle.hh +++ b/senf/Socket/FileHandle.hh @@ -67,8 +67,8 @@ // Custom includes #include // std::auto_ptr -#include "../Utils/safe_bool.hh" -#include "../Scheduler/ClockService.hh" +#include +#include //#include "FileHandle.mpp" ///////////////////////////////hh.p//////////////////////////////////////// diff --git a/senf/Socket/FileHandle.ih b/senf/Socket/FileHandle.ih index b13f2fe..748b2d1 100644 --- a/senf/Socket/FileHandle.ih +++ b/senf/Socket/FileHandle.ih @@ -29,8 +29,8 @@ // Custom includes #include -#include "../Utils/intrusive_refcount.hh" -#include "../Utils/pool_alloc_mixin.hh" +#include +#include ///////////////////////////////ih.p//////////////////////////////////////// diff --git a/senf/Socket/FileHandle.test.cc b/senf/Socket/FileHandle.test.cc index 60ba3ba..1023e25 100644 --- a/senf/Socket/FileHandle.test.cc +++ b/senf/Socket/FileHandle.test.cc @@ -32,7 +32,7 @@ #include #include "FileHandle.hh" -#include "../Utils/auto_unit_test.hh" +#include #include #define prefix_ diff --git a/senf/Socket/NetdeviceController.cc b/senf/Socket/NetdeviceController.cc index fa020d8..ceb132f 100644 --- a/senf/Socket/NetdeviceController.cc +++ b/senf/Socket/NetdeviceController.cc @@ -31,7 +31,7 @@ #include #include #include -#include "../Utils/Exception.hh" +#include #define prefix_ ///////////////////////////////cc.p//////////////////////////////////////// diff --git a/senf/Socket/NetdeviceController.hh b/senf/Socket/NetdeviceController.hh index e969cda..4ff1187 100644 --- a/senf/Socket/NetdeviceController.hh +++ b/senf/Socket/NetdeviceController.hh @@ -31,7 +31,7 @@ #include #include #include -#include "Protocols/Raw/MACAddress.hh" +#include //#include "NetdeviceController.mpp" diff --git a/senf/Socket/NetdeviceController.test.cc b/senf/Socket/NetdeviceController.test.cc index 38f1912..c545b40 100644 --- a/senf/Socket/NetdeviceController.test.cc +++ b/senf/Socket/NetdeviceController.test.cc @@ -28,10 +28,10 @@ // Custom includes #include "NetdeviceController.hh" -#include "Protocols/Raw/MACAddress.hh" +#include #include -#include "../Utils/auto_unit_test.hh" +#include #include #define prefix_ diff --git a/senf/Socket/ProtocolClientSocketHandle.cti b/senf/Socket/ProtocolClientSocketHandle.cti index 1d49c70..dd1dfdc 100644 --- a/senf/Socket/ProtocolClientSocketHandle.cti +++ b/senf/Socket/ProtocolClientSocketHandle.cti @@ -30,7 +30,7 @@ //#include "ProtocolClientSocketHandle.ih" // Custom includes -#include "../Utils/senfassert.hh" +#include #define prefix_ inline ///////////////////////////////cti.p/////////////////////////////////////// diff --git a/senf/Socket/ProtocolClientSocketHandle.hh b/senf/Socket/ProtocolClientSocketHandle.hh index a633951..8492e3b 100644 --- a/senf/Socket/ProtocolClientSocketHandle.hh +++ b/senf/Socket/ProtocolClientSocketHandle.hh @@ -29,8 +29,8 @@ // Custom includes #include "ClientSocketHandle.hh" -#include "../config.hh" -#include "../Utils/Tags.hh" +#include +#include #include "ProtocolClientSocketHandle.mpp" ///////////////////////////////hh.p//////////////////////////////////////// diff --git a/senf/Socket/ProtocolClientSocketHandle.test.cc b/senf/Socket/ProtocolClientSocketHandle.test.cc index 1314742..b14805e 100644 --- a/senf/Socket/ProtocolClientSocketHandle.test.cc +++ b/senf/Socket/ProtocolClientSocketHandle.test.cc @@ -30,7 +30,7 @@ #include "ProtocolClientSocketHandle.hh" #include "SocketProtocol.test.hh" -#include "../Utils/auto_unit_test.hh" +#include #include #define prefix_ diff --git a/senf/Socket/ProtocolServerSocketHandle.cti b/senf/Socket/ProtocolServerSocketHandle.cti index 26c2b69..482a3f2 100644 --- a/senf/Socket/ProtocolServerSocketHandle.cti +++ b/senf/Socket/ProtocolServerSocketHandle.cti @@ -29,7 +29,7 @@ //#include "ProtocolServerSocketHandle.ih" // Custom includes -#include "../Utils/senfassert.hh" +#include #include "ProtocolClientSocketHandle.hh" #define prefix_ inline diff --git a/senf/Socket/ProtocolServerSocketHandle.hh b/senf/Socket/ProtocolServerSocketHandle.hh index 57d980e..dbb3b04 100644 --- a/senf/Socket/ProtocolServerSocketHandle.hh +++ b/senf/Socket/ProtocolServerSocketHandle.hh @@ -29,8 +29,8 @@ // Custom includes #include "ServerSocketHandle.hh" -#include "../config.hh" -#include "../Utils/Tags.hh" +#include +#include #include "ProtocolServerSocketHandle.mpp" ///////////////////////////////hh.p//////////////////////////////////////// diff --git a/senf/Socket/ProtocolServerSocketHandle.test.cc b/senf/Socket/ProtocolServerSocketHandle.test.cc index 7d51364..1dea882 100644 --- a/senf/Socket/ProtocolServerSocketHandle.test.cc +++ b/senf/Socket/ProtocolServerSocketHandle.test.cc @@ -30,7 +30,7 @@ #include "ProtocolServerSocketHandle.hh" #include "SocketProtocol.test.hh" -#include "../Utils/auto_unit_test.hh" +#include #include #define prefix_ diff --git a/senf/Socket/Protocols/AddressExceptions.hh b/senf/Socket/Protocols/AddressExceptions.hh index 9184fd4..bf7f605 100644 --- a/senf/Socket/Protocols/AddressExceptions.hh +++ b/senf/Socket/Protocols/AddressExceptions.hh @@ -27,7 +27,7 @@ #define HH_SENF_Socket_Protocols_AddressExceptions_ 1 // Custom includes -#include "../../Utils/Exception.hh" +#include //#include "AddressExceptions.mpp" ///////////////////////////////hh.p//////////////////////////////////////// diff --git a/senf/Socket/Protocols/BSDAddressingPolicy.cc b/senf/Socket/Protocols/BSDAddressingPolicy.cc index c3f6e12..c8b9c12 100644 --- a/senf/Socket/Protocols/BSDAddressingPolicy.cc +++ b/senf/Socket/Protocols/BSDAddressingPolicy.cc @@ -30,7 +30,7 @@ // Custom includes #include #include -#include "../../Utils/Exception.hh" +#include //#include "BSDAddressingPolicy.mpp" #define prefix_ diff --git a/senf/Socket/Protocols/BSDAddressingPolicy.hh b/senf/Socket/Protocols/BSDAddressingPolicy.hh index 8ec831c..fd8585e 100644 --- a/senf/Socket/Protocols/BSDAddressingPolicy.hh +++ b/senf/Socket/Protocols/BSDAddressingPolicy.hh @@ -31,10 +31,10 @@ #define HH_SENF_Socket_Protocols_BSDAddressingPolicy_ 1 // Custom includes -#include "../SocketHandle.hh" -#include "../FileHandle.hh" -#include "../SocketPolicy.hh" -#include "../CommunicationPolicy.hh" +#include +#include +#include +#include #include "BSDSocketAddress.hh" //#include "BSDAddressingPolicy.mpp" diff --git a/senf/Socket/Protocols/BSDAddressingPolicy.test.cc b/senf/Socket/Protocols/BSDAddressingPolicy.test.cc index f793efa..e8eb4d7 100644 --- a/senf/Socket/Protocols/BSDAddressingPolicy.test.cc +++ b/senf/Socket/Protocols/BSDAddressingPolicy.test.cc @@ -28,9 +28,9 @@ // Custom includes #include "BSDAddressingPolicy.hh" -#include "INet/TCPSocketHandle.hh" +#include -#include "../../Utils/auto_unit_test.hh" +#include #include #define prefix_ diff --git a/senf/Socket/Protocols/BSDSocketAddress.cc b/senf/Socket/Protocols/BSDSocketAddress.cc index 1f3e9b3..af50ee0 100644 --- a/senf/Socket/Protocols/BSDSocketAddress.cc +++ b/senf/Socket/Protocols/BSDSocketAddress.cc @@ -27,9 +27,9 @@ //#include "BSDSocketAddress.ih" // Custom includes -#include "INet/INetAddressing.hh" -#include "UN/UNAddressing.hh" -#include "Raw/LLAddressing.hh" +#include +#include +#include //#include "BSDSocketAddress.mpp" #define prefix_ diff --git a/senf/Socket/Protocols/BSDSocketAddress.hh b/senf/Socket/Protocols/BSDSocketAddress.hh index 2040513..16e6465 100644 --- a/senf/Socket/Protocols/BSDSocketAddress.hh +++ b/senf/Socket/Protocols/BSDSocketAddress.hh @@ -30,7 +30,7 @@ #include #include #include -#include "../../Utils/safe_bool.hh" +#include #include #include diff --git a/senf/Socket/Protocols/BSDSocketAddress.test.cc b/senf/Socket/Protocols/BSDSocketAddress.test.cc index cb53808..3968be9 100644 --- a/senf/Socket/Protocols/BSDSocketAddress.test.cc +++ b/senf/Socket/Protocols/BSDSocketAddress.test.cc @@ -28,9 +28,9 @@ // Custom includes #include "BSDSocketAddress.hh" -#include "INet/INetAddressing.hh" +#include -#include "../../Utils/auto_unit_test.hh" +#include #include #define prefix_ diff --git a/senf/Socket/Protocols/BSDSocketProtocol.cc b/senf/Socket/Protocols/BSDSocketProtocol.cc index 4524cae..3ce0477 100644 --- a/senf/Socket/Protocols/BSDSocketProtocol.cc +++ b/senf/Socket/Protocols/BSDSocketProtocol.cc @@ -30,7 +30,7 @@ #include #include #include -#include "../../Socket/SocketHandle.hh" +#include //#include "BSDSocketProtocol.mpp" #define prefix_ diff --git a/senf/Socket/Protocols/BSDSocketProtocol.hh b/senf/Socket/Protocols/BSDSocketProtocol.hh index 715837f..3511708 100644 --- a/senf/Socket/Protocols/BSDSocketProtocol.hh +++ b/senf/Socket/Protocols/BSDSocketProtocol.hh @@ -27,7 +27,7 @@ #define HH_SENF_Socket_Protocols_BSDSocketProtocol_ 1 // Custom includes -#include "../../Socket/SocketProtocol.hh" +#include #include //#include "BSDSocketProtocol.mpp" diff --git a/senf/Socket/Protocols/DVB.hh b/senf/Socket/Protocols/DVB.hh index 07bf0d9..efcc77d 100644 --- a/senf/Socket/Protocols/DVB.hh +++ b/senf/Socket/Protocols/DVB.hh @@ -23,7 +23,7 @@ /** \file \brief INet public header */ -#include "DVB/DVB.hh" +#include // Local Variables: diff --git a/senf/Socket/Protocols/DVB/DVBConfigParser.cc b/senf/Socket/Protocols/DVB/DVBConfigParser.cc index fa57d9f..c0c6c14 100644 --- a/senf/Socket/Protocols/DVB/DVBConfigParser.cc +++ b/senf/Socket/Protocols/DVB/DVBConfigParser.cc @@ -1,7 +1,7 @@ #include "DVBConfigParser.hh" #include -#include "senf/Utils/Exception.hh" -#include "senf/Utils/Logger.hh" +#include +#include using namespace std; #define prefix_ diff --git a/senf/Socket/Protocols/DVB/DVBDemuxHandles.cc b/senf/Socket/Protocols/DVB/DVBDemuxHandles.cc index f71251e..a7e92e9 100644 --- a/senf/Socket/Protocols/DVB/DVBDemuxHandles.cc +++ b/senf/Socket/Protocols/DVB/DVBDemuxHandles.cc @@ -31,7 +31,7 @@ #include #include #include -#include "../../../Utils/Exception.hh" +#include //#include "DVBDemuxHandles.mpp" diff --git a/senf/Socket/Protocols/DVB/DVBDemuxHandles.hh b/senf/Socket/Protocols/DVB/DVBDemuxHandles.hh index 9b4b73a..fbf67d1 100644 --- a/senf/Socket/Protocols/DVB/DVBDemuxHandles.hh +++ b/senf/Socket/Protocols/DVB/DVBDemuxHandles.hh @@ -27,10 +27,10 @@ #define HH_SENF_Socket_Protocols_DVB_DVBDemuxHandles_ 1 // Custom includes -#include "../../../Socket/FramingPolicy.hh" -#include "../../../Socket/CommunicationPolicy.hh" -#include "../../../Socket/ReadWritePolicy.hh" -#include "../../../Socket/ProtocolClientSocketHandle.hh" +#include +#include +#include +#include #include "DVBDemuxSocketProtocol.hh" //#include "DVBDemuxHandles.mpp" diff --git a/senf/Socket/Protocols/DVB/DVBDemuxSocketProtocol.cc b/senf/Socket/Protocols/DVB/DVBDemuxSocketProtocol.cc index 1394a19..d247368 100644 --- a/senf/Socket/Protocols/DVB/DVBDemuxSocketProtocol.cc +++ b/senf/Socket/Protocols/DVB/DVBDemuxSocketProtocol.cc @@ -32,7 +32,7 @@ #include #include #include -#include "../../../Socket/SocketHandle.hh" +#include //#include "DVBDemuxSocketProtocol.mpp" #define prefix_ diff --git a/senf/Socket/Protocols/DVB/DVBDemuxSocketProtocol.hh b/senf/Socket/Protocols/DVB/DVBDemuxSocketProtocol.hh index 632b528..a3b4f33 100644 --- a/senf/Socket/Protocols/DVB/DVBDemuxSocketProtocol.hh +++ b/senf/Socket/Protocols/DVB/DVBDemuxSocketProtocol.hh @@ -29,7 +29,7 @@ #include // Custom includes -#include "../../../Socket/SocketProtocol.hh" +#include //#include "DVBSocketProtocol.mpp" ///////////////////////////////hh.p//////////////////////////////////////// diff --git a/senf/Socket/Protocols/DVB/DVBFrontendHandle.cc b/senf/Socket/Protocols/DVB/DVBFrontendHandle.cc index bb63f70..5194f6c 100644 --- a/senf/Socket/Protocols/DVB/DVBFrontendHandle.cc +++ b/senf/Socket/Protocols/DVB/DVBFrontendHandle.cc @@ -30,7 +30,7 @@ // Custom includes #include #include -#include "../../../Utils/Exception.hh" +#include #include diff --git a/senf/Socket/Protocols/DVB/DVBFrontendHandle.hh b/senf/Socket/Protocols/DVB/DVBFrontendHandle.hh index bc555ff..b5a642c 100644 --- a/senf/Socket/Protocols/DVB/DVBFrontendHandle.hh +++ b/senf/Socket/Protocols/DVB/DVBFrontendHandle.hh @@ -32,11 +32,11 @@ #include #include #include -#include "../../../Socket/FramingPolicy.hh" -#include "../../../Socket/CommunicationPolicy.hh" -#include "../../../Socket/ReadWritePolicy.hh" -#include "../../../Socket/ProtocolClientSocketHandle.hh" -#include "../../../Socket/SocketProtocol.hh" +#include +#include +#include +#include +#include #include //#include "DVBFrontendHandle.mpp" ///////////////////////////////hh.p//////////////////////////////////////// diff --git a/senf/Socket/Protocols/DVB/DVBProtocolWrapper.hh b/senf/Socket/Protocols/DVB/DVBProtocolWrapper.hh index cc694c6..5651a6c 100644 --- a/senf/Socket/Protocols/DVB/DVBProtocolWrapper.hh +++ b/senf/Socket/Protocols/DVB/DVBProtocolWrapper.hh @@ -23,8 +23,8 @@ #ifndef HH_SENF_Socket_Protocols_DVB_DVBProtocolWrapper_ #define HH_SENF_Socket_Protocols_DVB_DVBProtocolWrapper_ 1 -#include "senf/Utils/Console/Console.hh" -#include "senf/Utils/Console/Console.hh" +#include +#include #include "DVBDemuxHandles.hh" // Custom includes diff --git a/senf/Socket/Protocols/DVB/DVBSocketController.cc b/senf/Socket/Protocols/DVB/DVBSocketController.cc index e8eb3f0..9a6e48b 100644 --- a/senf/Socket/Protocols/DVB/DVBSocketController.cc +++ b/senf/Socket/Protocols/DVB/DVBSocketController.cc @@ -27,9 +27,9 @@ // Custom includes #include -#include "senf/Utils/Exception.hh" -#include "senf/Utils/Logger/Logger.hh" -#include "senf/Utils/membind.hh" +#include +#include +#include #include #define prefix_ diff --git a/senf/Socket/Protocols/DVB/DVBSocketController.hh b/senf/Socket/Protocols/DVB/DVBSocketController.hh index 8875041..0fce1cd 100644 --- a/senf/Socket/Protocols/DVB/DVBSocketController.hh +++ b/senf/Socket/Protocols/DVB/DVBSocketController.hh @@ -31,8 +31,8 @@ #include "DVBDemuxHandles.hh" #include "DVBConfigParser.hh" #include "DVBProtocolWrapper.hh" -#include "../../../Scheduler/Scheduler.hh" -#include "../../../Utils/Console/Console.hh" +#include +#include #define MPE_TABLEID 62 diff --git a/senf/Socket/Protocols/DVB/main.test.cc b/senf/Socket/Protocols/DVB/main.test.cc index a035027..0704c2f 100644 --- a/senf/Socket/Protocols/DVB/main.test.cc +++ b/senf/Socket/Protocols/DVB/main.test.cc @@ -27,7 +27,7 @@ // Custom includes #define BOOST_AUTO_TEST_MAIN -#include "../../../Utils/auto_unit_test.hh" +#include #include #define prefix_ diff --git a/senf/Socket/Protocols/DatagramSocketProtocol.hh b/senf/Socket/Protocols/DatagramSocketProtocol.hh index 73df063..a0586b7 100644 --- a/senf/Socket/Protocols/DatagramSocketProtocol.hh +++ b/senf/Socket/Protocols/DatagramSocketProtocol.hh @@ -28,8 +28,8 @@ // Custom includes #include -#include "../../Socket/SocketProtocol.hh" -#include "../../Scheduler/ClockService.hh" +#include +#include //#include "DatagramSocketProtocol.mpp" ///////////////////////////////hh.p//////////////////////////////////////// diff --git a/senf/Socket/Protocols/INet.hh b/senf/Socket/Protocols/INet.hh index cd35d01..b03d012 100644 --- a/senf/Socket/Protocols/INet.hh +++ b/senf/Socket/Protocols/INet.hh @@ -23,7 +23,7 @@ /** \file \brief INet public header */ -#include "INet/INet.hh" +#include // Local Variables: diff --git a/senf/Socket/Protocols/INet/ConnectedRawINetSocketHandle.cc b/senf/Socket/Protocols/INet/ConnectedRawINetSocketHandle.cc index 47ca1e1..c332605 100644 --- a/senf/Socket/Protocols/INet/ConnectedRawINetSocketHandle.cc +++ b/senf/Socket/Protocols/INet/ConnectedRawINetSocketHandle.cc @@ -27,7 +27,7 @@ #include #include -#include "../../../Utils/Exception.hh" +#include //#include "UDPSocketHandle.mpp" #define prefix_ diff --git a/senf/Socket/Protocols/INet/ConnectedRawINetSocketHandle.hh b/senf/Socket/Protocols/INet/ConnectedRawINetSocketHandle.hh index 0f63559..ddcec24 100644 --- a/senf/Socket/Protocols/INet/ConnectedRawINetSocketHandle.hh +++ b/senf/Socket/Protocols/INet/ConnectedRawINetSocketHandle.hh @@ -26,12 +26,12 @@ // Custom includes #include "INetSocketProtocol.hh" #include "RawINetSocketProtocol.hh" -#include "../../../Socket/Protocols/BSDSocketProtocol.hh" -#include "../../../Socket/Protocols/DatagramSocketProtocol.hh" -#include "../../../Socket/FramingPolicy.hh" -#include "../../../Socket/CommunicationPolicy.hh" -#include "../../../Socket/ReadWritePolicy.hh" -#include "../../../Socket/ProtocolClientSocketHandle.hh" +#include +#include +#include +#include +#include +#include ///////////////////////////////hh.p//////////////////////////////////////// diff --git a/senf/Socket/Protocols/INet/ConnectedUDPSocketHandle.cc b/senf/Socket/Protocols/INet/ConnectedUDPSocketHandle.cc index f65299d..d35ff6e 100644 --- a/senf/Socket/Protocols/INet/ConnectedUDPSocketHandle.cc +++ b/senf/Socket/Protocols/INet/ConnectedUDPSocketHandle.cc @@ -32,7 +32,7 @@ #include #include -#include "../../../Utils/Exception.hh" +#include //#include "ConnectedUDPSocketHandle.mpp" #define prefix_ diff --git a/senf/Socket/Protocols/INet/ConnectedUDPSocketHandle.hh b/senf/Socket/Protocols/INet/ConnectedUDPSocketHandle.hh index 33ec138..ab839b7 100644 --- a/senf/Socket/Protocols/INet/ConnectedUDPSocketHandle.hh +++ b/senf/Socket/Protocols/INet/ConnectedUDPSocketHandle.hh @@ -33,12 +33,12 @@ // Custom includes #include "INetSocketProtocol.hh" #include "UDPSocketProtocol.hh" -#include "../../../Socket/Protocols/BSDSocketProtocol.hh" -#include "../../../Socket/Protocols/DatagramSocketProtocol.hh" -#include "../../../Socket/FramingPolicy.hh" -#include "../../../Socket/CommunicationPolicy.hh" -#include "../../../Socket/ReadWritePolicy.hh" -#include "../../../Socket/ProtocolClientSocketHandle.hh" +#include +#include +#include +#include +#include +#include //#include "ConnectedUDPSocketHandle.mpp" ///////////////////////////////hh.p//////////////////////////////////////// diff --git a/senf/Socket/Protocols/INet/INet4Address.hh b/senf/Socket/Protocols/INet/INet4Address.hh index 6651d68..b406151 100644 --- a/senf/Socket/Protocols/INet/INet4Address.hh +++ b/senf/Socket/Protocols/INet/INet4Address.hh @@ -32,9 +32,9 @@ #include #include #include -#include "../../../Utils/safe_bool.hh" -#include "../../../Utils/Tags.hh" -#include "../AddressExceptions.hh" +#include +#include +#include //#include "INet4Address.mpp" ///////////////////////////////hh.p//////////////////////////////////////// diff --git a/senf/Socket/Protocols/INet/INet4Address.test.cc b/senf/Socket/Protocols/INet/INet4Address.test.cc index c707745..a4b1441 100644 --- a/senf/Socket/Protocols/INet/INet4Address.test.cc +++ b/senf/Socket/Protocols/INet/INet4Address.test.cc @@ -30,9 +30,9 @@ #include #include #include "INet4Address.hh" -#include "../../../Utils/String.hh" +#include -#include "../../../Utils/auto_unit_test.hh" +#include #include #define prefix_ diff --git a/senf/Socket/Protocols/INet/INet6Address.hh b/senf/Socket/Protocols/INet/INet6Address.hh index a80e0ad..25209ca 100644 --- a/senf/Socket/Protocols/INet/INet6Address.hh +++ b/senf/Socket/Protocols/INet/INet6Address.hh @@ -33,12 +33,12 @@ #include #include #include -#include "../../../Utils/safe_bool.hh" -#include "../../../Utils/Tags.hh" +#include +#include #include "INet4Address.hh" -#include "../AddressExceptions.hh" -#include "../Raw/MACAddress.hh" -#include "../Raw/EUI64.hh" +#include +#include +#include //#include "INet6Address.mpp" #include "INet6Address.ih" diff --git a/senf/Socket/Protocols/INet/INet6Address.test.cc b/senf/Socket/Protocols/INet/INet6Address.test.cc index 391c8ec..7a09b83 100644 --- a/senf/Socket/Protocols/INet/INet6Address.test.cc +++ b/senf/Socket/Protocols/INet/INet6Address.test.cc @@ -28,9 +28,9 @@ // Custom includes #include "INet6Address.hh" -#include "../../../Utils/String.hh" +#include -#include "../../../Utils/auto_unit_test.hh" +#include #include #define prefix_ diff --git a/senf/Socket/Protocols/INet/INetAddressing.cc b/senf/Socket/Protocols/INet/INetAddressing.cc index e224408..640970c 100644 --- a/senf/Socket/Protocols/INet/INetAddressing.cc +++ b/senf/Socket/Protocols/INet/INetAddressing.cc @@ -34,7 +34,7 @@ #include #include #include -#include "../../../Utils/senfassert.hh" +#include //#include "INetAddressing.mpp" #define prefix_ diff --git a/senf/Socket/Protocols/INet/INetAddressing.hh b/senf/Socket/Protocols/INet/INetAddressing.hh index 94e3c02..c4cf7d0 100644 --- a/senf/Socket/Protocols/INet/INetAddressing.hh +++ b/senf/Socket/Protocols/INet/INetAddressing.hh @@ -31,11 +31,11 @@ #include #include #include -#include "../../SocketPolicy.hh" -#include "../../ClientSocketHandle.hh" -#include "../../CommunicationPolicy.hh" -#include "../BSDAddressingPolicy.hh" -#include "../BSDSocketAddress.hh" +#include +#include +#include +#include +#include #include "INet4Address.hh" #include "INet6Address.hh" diff --git a/senf/Socket/Protocols/INet/INetAddressing.test.cc b/senf/Socket/Protocols/INet/INetAddressing.test.cc index ba0b597..9d6ab63 100644 --- a/senf/Socket/Protocols/INet/INetAddressing.test.cc +++ b/senf/Socket/Protocols/INet/INetAddressing.test.cc @@ -28,9 +28,9 @@ // Custom includes #include "INetAddressing.hh" -#include "../../../Utils/String.hh" +#include -#include "../../../Utils/auto_unit_test.hh" +#include #include #define prefix_ diff --git a/senf/Socket/Protocols/INet/INetSocketProtocol.cc b/senf/Socket/Protocols/INet/INetSocketProtocol.cc index c83d53f..8bd867e 100644 --- a/senf/Socket/Protocols/INet/INetSocketProtocol.cc +++ b/senf/Socket/Protocols/INet/INetSocketProtocol.cc @@ -30,7 +30,7 @@ #include #include #include -#include "../../../Utils/Exception.hh" +#include //#include "INetSocketProtocol.mpp" #define prefix_ diff --git a/senf/Socket/Protocols/INet/INetSocketProtocol.hh b/senf/Socket/Protocols/INet/INetSocketProtocol.hh index 0d90ef0..d6adb10 100644 --- a/senf/Socket/Protocols/INet/INetSocketProtocol.hh +++ b/senf/Socket/Protocols/INet/INetSocketProtocol.hh @@ -34,10 +34,10 @@ #define HH_SENF_Socket_Protocols_INet_INetSocketProtocol_ 1 // Custom includes -#include "../../../Socket/SocketProtocol.hh" +#include #include "INetAddressing.hh" -#include "../../../Socket/ClientSocketHandle.hh" -#include "../../../Socket/CommunicationPolicy.hh" +#include +#include //#include "INetSocketProtocol.mpp" ///////////////////////////////hh.p//////////////////////////////////////// diff --git a/senf/Socket/Protocols/INet/MulticastSocketProtocol.cc b/senf/Socket/Protocols/INet/MulticastSocketProtocol.cc index e37108f..20edba6 100644 --- a/senf/Socket/Protocols/INet/MulticastSocketProtocol.cc +++ b/senf/Socket/Protocols/INet/MulticastSocketProtocol.cc @@ -30,7 +30,7 @@ #include #include #include // for if_nametoindex -#include "../../../Utils/Exception.hh" +#include //#include "MulticastSocketProtocol.mpp" #define prefix_ diff --git a/senf/Socket/Protocols/INet/MulticastSocketProtocol.hh b/senf/Socket/Protocols/INet/MulticastSocketProtocol.hh index 173f4fd..9ba6a00 100644 --- a/senf/Socket/Protocols/INet/MulticastSocketProtocol.hh +++ b/senf/Socket/Protocols/INet/MulticastSocketProtocol.hh @@ -27,7 +27,7 @@ #define HH_SENF_Socket_Protocols_INet_MulticastSocketProtocol_ 1 // Custom includes -#include "../../../Socket/SocketProtocol.hh" +#include #include "INet4Address.hh" #include "INet6Address.hh" diff --git a/senf/Socket/Protocols/INet/MulticastSocketProtocol.test.cc b/senf/Socket/Protocols/INet/MulticastSocketProtocol.test.cc index 8493c86..a4d8d29 100644 --- a/senf/Socket/Protocols/INet/MulticastSocketProtocol.test.cc +++ b/senf/Socket/Protocols/INet/MulticastSocketProtocol.test.cc @@ -29,7 +29,7 @@ // Custom includes #include "UDPSocketHandle.hh" -#include "../../../Utils/auto_unit_test.hh" +#include #include #define prefix_ diff --git a/senf/Socket/Protocols/INet/RawINetSocketHandle.cc b/senf/Socket/Protocols/INet/RawINetSocketHandle.cc index eb39628..675ba10 100644 --- a/senf/Socket/Protocols/INet/RawINetSocketHandle.cc +++ b/senf/Socket/Protocols/INet/RawINetSocketHandle.cc @@ -27,7 +27,7 @@ #include #include -#include "../../../Utils/Exception.hh" +#include //#include "UDPSocketHandle.mpp" #define prefix_ diff --git a/senf/Socket/Protocols/INet/RawINetSocketHandle.hh b/senf/Socket/Protocols/INet/RawINetSocketHandle.hh index e0001fa..ca1c380 100644 --- a/senf/Socket/Protocols/INet/RawINetSocketHandle.hh +++ b/senf/Socket/Protocols/INet/RawINetSocketHandle.hh @@ -28,12 +28,12 @@ #include "INetSocketProtocol.hh" #include "RawINetSocketProtocol.hh" #include "MulticastSocketProtocol.hh" -#include "../../../Socket/Protocols/BSDSocketProtocol.hh" -#include "../../../Socket/Protocols/DatagramSocketProtocol.hh" -#include "../../../Socket/FramingPolicy.hh" -#include "../../../Socket/CommunicationPolicy.hh" -#include "../../../Socket/ReadWritePolicy.hh" -#include "../../../Socket/ProtocolClientSocketHandle.hh" +#include +#include +#include +#include +#include +#include ///////////////////////////////hh.p//////////////////////////////////////// diff --git a/senf/Socket/Protocols/INet/RawINetSocketHandle.test.cc b/senf/Socket/Protocols/INet/RawINetSocketHandle.test.cc index 1ea5cd8..1b5908a 100644 --- a/senf/Socket/Protocols/INet/RawINetSocketHandle.test.cc +++ b/senf/Socket/Protocols/INet/RawINetSocketHandle.test.cc @@ -32,7 +32,7 @@ #include "RawINetSocketHandle.hh" #include -#include "../../../Utils/auto_unit_test.hh" +#include #include namespace { diff --git a/senf/Socket/Protocols/INet/RawINetSocketProtocol.cc b/senf/Socket/Protocols/INet/RawINetSocketProtocol.cc index 8a676be..ed01573 100644 --- a/senf/Socket/Protocols/INet/RawINetSocketProtocol.cc +++ b/senf/Socket/Protocols/INet/RawINetSocketProtocol.cc @@ -29,7 +29,7 @@ #include #include // for SIOCINQ / SIOCOUTQ #include // for if_nametoindex -#include "../../../Socket/SocketHandle.hh" +#include //#include "UDPSocketProtocol.mpp" #define prefix_ diff --git a/senf/Socket/Protocols/INet/RawINetSocketProtocol.hh b/senf/Socket/Protocols/INet/RawINetSocketProtocol.hh index c93058a..3955184 100644 --- a/senf/Socket/Protocols/INet/RawINetSocketProtocol.hh +++ b/senf/Socket/Protocols/INet/RawINetSocketProtocol.hh @@ -26,11 +26,11 @@ // Custom includes #include "INetAddressing.hh" #include "INetSocketProtocol.hh" -#include "../../../Socket/Protocols/BSDSocketProtocol.hh" -#include "../../../Socket/FramingPolicy.hh" -#include "../../../Socket/CommunicationPolicy.hh" -#include "../../../Socket/ReadWritePolicy.hh" -#include "../../../Socket/ProtocolClientSocketHandle.hh" +#include +#include +#include +#include +#include namespace senf { diff --git a/senf/Socket/Protocols/INet/TCPSocketHandle.cc b/senf/Socket/Protocols/INet/TCPSocketHandle.cc index 39af9cf..17bdc11 100644 --- a/senf/Socket/Protocols/INet/TCPSocketHandle.cc +++ b/senf/Socket/Protocols/INet/TCPSocketHandle.cc @@ -32,7 +32,7 @@ #include #include -#include "../../../Utils/Exception.hh" +#include //#include "TCPSocketHandle.mpp" #define prefix_ diff --git a/senf/Socket/Protocols/INet/TCPSocketHandle.hh b/senf/Socket/Protocols/INet/TCPSocketHandle.hh index 476afad..cdb09e9 100644 --- a/senf/Socket/Protocols/INet/TCPSocketHandle.hh +++ b/senf/Socket/Protocols/INet/TCPSocketHandle.hh @@ -33,12 +33,12 @@ // Custom includes #include "INetSocketProtocol.hh" #include "TCPSocketProtocol.hh" -#include "../../../Socket/Protocols/BSDSocketProtocol.hh" -#include "../../../Socket/FramingPolicy.hh" -#include "../../../Socket/CommunicationPolicy.hh" -#include "../../../Socket/ReadWritePolicy.hh" -#include "../../../Socket/ProtocolClientSocketHandle.hh" -#include "../../../Socket/ProtocolServerSocketHandle.hh" +#include +#include +#include +#include +#include +#include //#include "TCPSocketHandle.mpp" ///////////////////////////////hh.p//////////////////////////////////////// diff --git a/senf/Socket/Protocols/INet/TCPSocketHandle.test.cc b/senf/Socket/Protocols/INet/TCPSocketHandle.test.cc index b9952c1..8a00385 100644 --- a/senf/Socket/Protocols/INet/TCPSocketHandle.test.cc +++ b/senf/Socket/Protocols/INet/TCPSocketHandle.test.cc @@ -36,7 +36,7 @@ #include #include "TCPSocketHandle.hh" -#include "../../../Utils/auto_unit_test.hh" +#include #include #define prefix_ diff --git a/senf/Socket/Protocols/INet/TCPSocketProtocol.cc b/senf/Socket/Protocols/INet/TCPSocketProtocol.cc index 3c88242..eaeb83c 100644 --- a/senf/Socket/Protocols/INet/TCPSocketProtocol.cc +++ b/senf/Socket/Protocols/INet/TCPSocketProtocol.cc @@ -33,7 +33,7 @@ #include #include #include // for SIOCINQ / SIOCOUTQ -#include "../../../Socket/SocketHandle.hh" +#include //#include "TCPSocketProtocol.mpp" #define prefix_ diff --git a/senf/Socket/Protocols/INet/TCPSocketProtocol.hh b/senf/Socket/Protocols/INet/TCPSocketProtocol.hh index cca471e..dc9b0e8 100644 --- a/senf/Socket/Protocols/INet/TCPSocketProtocol.hh +++ b/senf/Socket/Protocols/INet/TCPSocketProtocol.hh @@ -28,7 +28,7 @@ #define HH_SENF_Socket_Protocols_INet_TCPSocketProtocol_ 1 // Custom includes -#include "../../../Socket/SocketProtocol.hh" +#include #include "INetSocketProtocol.hh" //#include "TCPSocketProtocol.mpp" diff --git a/senf/Socket/Protocols/INet/UDPSocketHandle.cc b/senf/Socket/Protocols/INet/UDPSocketHandle.cc index dabff8b..bc0517b 100644 --- a/senf/Socket/Protocols/INet/UDPSocketHandle.cc +++ b/senf/Socket/Protocols/INet/UDPSocketHandle.cc @@ -32,7 +32,7 @@ #include #include -#include "../../../Utils/Exception.hh" +#include //#include "UDPSocketHandle.mpp" #define prefix_ diff --git a/senf/Socket/Protocols/INet/UDPSocketHandle.hh b/senf/Socket/Protocols/INet/UDPSocketHandle.hh index 1b07145..839f52c 100644 --- a/senf/Socket/Protocols/INet/UDPSocketHandle.hh +++ b/senf/Socket/Protocols/INet/UDPSocketHandle.hh @@ -34,12 +34,12 @@ #include "INetSocketProtocol.hh" #include "UDPSocketProtocol.hh" #include "MulticastSocketProtocol.hh" -#include "../../../Socket/Protocols/BSDSocketProtocol.hh" -#include "../../../Socket/Protocols/DatagramSocketProtocol.hh" -#include "../../../Socket/FramingPolicy.hh" -#include "../../../Socket/CommunicationPolicy.hh" -#include "../../../Socket/ReadWritePolicy.hh" -#include "../../../Socket/ProtocolClientSocketHandle.hh" +#include +#include +#include +#include +#include +#include //#include "UDPSocketHandle.mpp" ///////////////////////////////hh.p//////////////////////////////////////// diff --git a/senf/Socket/Protocols/INet/UDPSocketHandle.test.cc b/senf/Socket/Protocols/INet/UDPSocketHandle.test.cc index ee75c4b..728faf1 100644 --- a/senf/Socket/Protocols/INet/UDPSocketHandle.test.cc +++ b/senf/Socket/Protocols/INet/UDPSocketHandle.test.cc @@ -36,7 +36,7 @@ #include "UDPSocketHandle.hh" #include -#include "../../../Utils/auto_unit_test.hh" +#include #include #define prefix_ diff --git a/senf/Socket/Protocols/INet/UDPSocketProtocol.cc b/senf/Socket/Protocols/INet/UDPSocketProtocol.cc index 8d95a4f..9a285ba 100644 --- a/senf/Socket/Protocols/INet/UDPSocketProtocol.cc +++ b/senf/Socket/Protocols/INet/UDPSocketProtocol.cc @@ -34,7 +34,7 @@ #include #include // for SIOCINQ / SIOCOUTQ #include // for if_nametoindex -#include "../../../Socket/SocketHandle.hh" +#include //#include "UDPSocketProtocol.mpp" #define prefix_ diff --git a/senf/Socket/Protocols/INet/UDPSocketProtocol.hh b/senf/Socket/Protocols/INet/UDPSocketProtocol.hh index 6802730..8429396 100644 --- a/senf/Socket/Protocols/INet/UDPSocketProtocol.hh +++ b/senf/Socket/Protocols/INet/UDPSocketProtocol.hh @@ -28,7 +28,7 @@ #define HH_SENF_Socket_Protocols_INet_UDPSocketProtocol_ 1 // Custom includes -#include "../../../Socket/SocketProtocol.hh" +#include #include "INetAddressing.hh" #include "INetSocketProtocol.hh" diff --git a/senf/Socket/Protocols/INet/main.test.cc b/senf/Socket/Protocols/INet/main.test.cc index 190483a..9f91d17 100644 --- a/senf/Socket/Protocols/INet/main.test.cc +++ b/senf/Socket/Protocols/INet/main.test.cc @@ -27,7 +27,7 @@ // Custom includes #define BOOST_AUTO_TEST_MAIN -#include "../../../Utils/auto_unit_test.hh" +#include #include #define prefix_ diff --git a/senf/Socket/Protocols/Raw.hh b/senf/Socket/Protocols/Raw.hh index b45a4f0..fcf49a5 100644 --- a/senf/Socket/Protocols/Raw.hh +++ b/senf/Socket/Protocols/Raw.hh @@ -23,7 +23,7 @@ /** \file \brief Raw public header */ -#include "Raw/Raw.hh" +#include // Local Variables: diff --git a/senf/Socket/Protocols/Raw/EUI64.cti b/senf/Socket/Protocols/Raw/EUI64.cti index 6f15591..8494c7d 100644 --- a/senf/Socket/Protocols/Raw/EUI64.cti +++ b/senf/Socket/Protocols/Raw/EUI64.cti @@ -26,7 +26,7 @@ //#include "EUI64.ih" // Custom includes -#include "../../../config.hh" +#include #define prefix_ inline ///////////////////////////////cti.p/////////////////////////////////////// diff --git a/senf/Socket/Protocols/Raw/EUI64.hh b/senf/Socket/Protocols/Raw/EUI64.hh index aa70d01..0149506 100644 --- a/senf/Socket/Protocols/Raw/EUI64.hh +++ b/senf/Socket/Protocols/Raw/EUI64.hh @@ -30,8 +30,8 @@ #include #include #include -#include "../../../Utils/Tags.hh" -#include "../../../Utils/safe_bool.hh" +#include +#include //#include "EUI64.mpp" ///////////////////////////////hh.p//////////////////////////////////////// diff --git a/senf/Socket/Protocols/Raw/EUI64.test.cc b/senf/Socket/Protocols/Raw/EUI64.test.cc index a36051d..028b318 100644 --- a/senf/Socket/Protocols/Raw/EUI64.test.cc +++ b/senf/Socket/Protocols/Raw/EUI64.test.cc @@ -29,7 +29,7 @@ // Custom includes #include "EUI64.hh" -#include "../../../Utils/auto_unit_test.hh" +#include #include #define prefix_ diff --git a/senf/Socket/Protocols/Raw/LLAddressing.cc b/senf/Socket/Protocols/Raw/LLAddressing.cc index 71addad..a15c2de 100644 --- a/senf/Socket/Protocols/Raw/LLAddressing.cc +++ b/senf/Socket/Protocols/Raw/LLAddressing.cc @@ -34,8 +34,8 @@ #include #include -#include "../../../Utils/Exception.hh" -#include "../AddressExceptions.hh" +#include +#include //#include "LLAddressing.mpp" #define prefix_ diff --git a/senf/Socket/Protocols/Raw/LLAddressing.hh b/senf/Socket/Protocols/Raw/LLAddressing.hh index 78a1c32..6cda49f 100644 --- a/senf/Socket/Protocols/Raw/LLAddressing.hh +++ b/senf/Socket/Protocols/Raw/LLAddressing.hh @@ -30,10 +30,10 @@ // Custom includes #include #include -#include "../../SocketPolicy.hh" -#include "../../FileHandle.hh" -#include "../BSDAddressingPolicy.hh" -#include "../BSDSocketAddress.hh" +#include +#include +#include +#include #include "MACAddress.hh" //#include "LLAddressing.mpp" diff --git a/senf/Socket/Protocols/Raw/LLAddressing.test.cc b/senf/Socket/Protocols/Raw/LLAddressing.test.cc index 5f91dc1..0f1502e 100644 --- a/senf/Socket/Protocols/Raw/LLAddressing.test.cc +++ b/senf/Socket/Protocols/Raw/LLAddressing.test.cc @@ -27,10 +27,10 @@ //#include "LLAddressing.test.ih" // Custom includes -#include "../../../Utils/String.hh" +#include #include "LLAddressing.hh" -#include "../../../Utils/auto_unit_test.hh" +#include #include #define prefix_ diff --git a/senf/Socket/Protocols/Raw/MACAddress.ct b/senf/Socket/Protocols/Raw/MACAddress.ct index e0b4ef3..bbc076b 100644 --- a/senf/Socket/Protocols/Raw/MACAddress.ct +++ b/senf/Socket/Protocols/Raw/MACAddress.ct @@ -26,7 +26,7 @@ //#include "MACAddress.ih" // Custom includes -#include "../../../config.hh" +#include #define prefix_ ///////////////////////////////ct.p//////////////////////////////////////// diff --git a/senf/Socket/Protocols/Raw/MACAddress.hh b/senf/Socket/Protocols/Raw/MACAddress.hh index cc4a6ba..7d49e62 100644 --- a/senf/Socket/Protocols/Raw/MACAddress.hh +++ b/senf/Socket/Protocols/Raw/MACAddress.hh @@ -32,9 +32,9 @@ #include #include #include -#include "../../../Utils/safe_bool.hh" -#include "../../../Utils/Tags.hh" -#include "../AddressExceptions.hh" +#include +#include +#include //#include "MACAddress.mpp" ///////////////////////////////hh.p//////////////////////////////////////// diff --git a/senf/Socket/Protocols/Raw/MACAddress.test.cc b/senf/Socket/Protocols/Raw/MACAddress.test.cc index 34749b0..6ff3472 100644 --- a/senf/Socket/Protocols/Raw/MACAddress.test.cc +++ b/senf/Socket/Protocols/Raw/MACAddress.test.cc @@ -29,10 +29,10 @@ // Custom includes #include #include "MACAddress.hh" -#include "../../../Utils/String.hh" +#include #include "EUI64.hh" -#include "../../../Utils/auto_unit_test.hh" +#include #include #define prefix_ diff --git a/senf/Socket/Protocols/Raw/PacketSocketHandle.hh b/senf/Socket/Protocols/Raw/PacketSocketHandle.hh index 35898ac..43b6c67 100644 --- a/senf/Socket/Protocols/Raw/PacketSocketHandle.hh +++ b/senf/Socket/Protocols/Raw/PacketSocketHandle.hh @@ -28,14 +28,14 @@ #define HH_SENF_Socket_Protocols_Raw_PacketSocketHandle_ 1 // Custom includes -#include "../../../Socket/SocketPolicy.hh" -#include "../../../Socket/SocketProtocol.hh" -#include "../../../Socket/ProtocolClientSocketHandle.hh" -#include "../../../Socket/FramingPolicy.hh" -#include "../../../Socket/CommunicationPolicy.hh" -#include "../../../Socket/ReadWritePolicy.hh" -#include "../../../Socket/Protocols/BSDSocketProtocol.hh" -#include "../../../Socket/Protocols/DatagramSocketProtocol.hh" +#include +#include +#include +#include +#include +#include +#include +#include #include "LLAddressing.hh" //#include "PacketSocketHandle.mpp" diff --git a/senf/Socket/Protocols/Raw/PacketSocketHandle.test.cc b/senf/Socket/Protocols/Raw/PacketSocketHandle.test.cc index 78d5476..6805f27 100644 --- a/senf/Socket/Protocols/Raw/PacketSocketHandle.test.cc +++ b/senf/Socket/Protocols/Raw/PacketSocketHandle.test.cc @@ -31,7 +31,7 @@ #include #include "PacketSocketHandle.hh" -#include "../../../Utils/auto_unit_test.hh" +#include #include #define prefix_ diff --git a/senf/Socket/Protocols/Raw/ParseString.ct b/senf/Socket/Protocols/Raw/ParseString.ct index 94eeeac..dec04ee 100644 --- a/senf/Socket/Protocols/Raw/ParseString.ct +++ b/senf/Socket/Protocols/Raw/ParseString.ct @@ -29,7 +29,7 @@ #include #include #include -#include "../../../Utils/String.hh" +#include #define prefix_ ///////////////////////////////ct.p//////////////////////////////////////// diff --git a/senf/Socket/Protocols/Raw/TunTapSocketHandle.hh b/senf/Socket/Protocols/Raw/TunTapSocketHandle.hh index fb5f95f..7c2cef6 100644 --- a/senf/Socket/Protocols/Raw/TunTapSocketHandle.hh +++ b/senf/Socket/Protocols/Raw/TunTapSocketHandle.hh @@ -28,13 +28,13 @@ #define HH_SENF_Socket_Protocols_Raw_TunTapSocketHandle_ 1 // Custom includes -#include "../../../Socket/SocketPolicy.hh" -#include "../../../Socket/SocketProtocol.hh" -#include "../../../Socket/ProtocolClientSocketHandle.hh" -#include "../../../Socket/FramingPolicy.hh" -#include "../../../Socket/CommunicationPolicy.hh" -#include "../../../Socket/ReadWritePolicy.hh" -#include "../../../Socket/Protocols/BSDSocketProtocol.hh" +#include +#include +#include +#include +#include +#include +#include #include "LLAddressing.hh" //#include "TunTapSocketHandle.mpp" diff --git a/senf/Socket/Protocols/Raw/TunTapSocketHandle.test.cc b/senf/Socket/Protocols/Raw/TunTapSocketHandle.test.cc index fc0c98e..442f475 100644 --- a/senf/Socket/Protocols/Raw/TunTapSocketHandle.test.cc +++ b/senf/Socket/Protocols/Raw/TunTapSocketHandle.test.cc @@ -34,7 +34,7 @@ #include "TunTapSocketHandle.hh" #include "PacketSocketHandle.hh" -#include "../../../Utils/auto_unit_test.hh" +#include #include #define prefix_ diff --git a/senf/Socket/Protocols/Raw/main.test.cc b/senf/Socket/Protocols/Raw/main.test.cc index 190483a..9f91d17 100644 --- a/senf/Socket/Protocols/Raw/main.test.cc +++ b/senf/Socket/Protocols/Raw/main.test.cc @@ -27,7 +27,7 @@ // Custom includes #define BOOST_AUTO_TEST_MAIN -#include "../../../Utils/auto_unit_test.hh" +#include #include #define prefix_ diff --git a/senf/Socket/Protocols/UN.hh b/senf/Socket/Protocols/UN.hh index ef73fd8..3fcc387 100644 --- a/senf/Socket/Protocols/UN.hh +++ b/senf/Socket/Protocols/UN.hh @@ -23,7 +23,7 @@ /** \file \brief UN public header */ -#include "UN/UN.hh" +#include // Local Variables: diff --git a/senf/Socket/Protocols/UN/ConnectedUNDatagramSocketHandle.cc b/senf/Socket/Protocols/UN/ConnectedUNDatagramSocketHandle.cc index af7fd44..7f74d98 100644 --- a/senf/Socket/Protocols/UN/ConnectedUNDatagramSocketHandle.cc +++ b/senf/Socket/Protocols/UN/ConnectedUNDatagramSocketHandle.cc @@ -30,7 +30,7 @@ #include #include -#include "../../../Utils/Exception.hh" +#include //#include "UNDatagramSocketHandle.mpp" #define prefix_ diff --git a/senf/Socket/Protocols/UN/ConnectedUNDatagramSocketHandle.hh b/senf/Socket/Protocols/UN/ConnectedUNDatagramSocketHandle.hh index 68c80e6..86bc0e7 100644 --- a/senf/Socket/Protocols/UN/ConnectedUNDatagramSocketHandle.hh +++ b/senf/Socket/Protocols/UN/ConnectedUNDatagramSocketHandle.hh @@ -29,11 +29,11 @@ // Custom includes #include "UNAddressing.hh" #include "UNSocketProtocol.hh" -#include "../../../Socket/Protocols/BSDSocketProtocol.hh" -#include "../../../Socket/FramingPolicy.hh" -#include "../../../Socket/CommunicationPolicy.hh" -#include "../../../Socket/ReadWritePolicy.hh" -#include "../../../Socket/ProtocolClientSocketHandle.hh" +#include +#include +#include +#include +#include //#include "UNDatagramSocketHandle.mpp" ///////////////////////////////hh.p//////////////////////////////////////// diff --git a/senf/Socket/Protocols/UN/UNAddressing.cc b/senf/Socket/Protocols/UN/UNAddressing.cc index 09ee9c7..7d23956 100644 --- a/senf/Socket/Protocols/UN/UNAddressing.cc +++ b/senf/Socket/Protocols/UN/UNAddressing.cc @@ -27,7 +27,7 @@ //#include "UNAddressing.ih" // Custom includes -#include "../AddressExceptions.hh" +#include #define prefix_ ///////////////////////////////cc.p//////////////////////////////////////// diff --git a/senf/Socket/Protocols/UN/UNAddressing.hh b/senf/Socket/Protocols/UN/UNAddressing.hh index eccb8d3..aeb3c5b 100644 --- a/senf/Socket/Protocols/UN/UNAddressing.hh +++ b/senf/Socket/Protocols/UN/UNAddressing.hh @@ -31,8 +31,8 @@ #include #include #include -#include "../BSDAddressingPolicy.hh" -#include "../BSDSocketAddress.hh" +#include +#include //#include "UNAddressing.mpp" ///////////////////////////////hh.p//////////////////////////////////////// diff --git a/senf/Socket/Protocols/UN/UNAddressing.test.cc b/senf/Socket/Protocols/UN/UNAddressing.test.cc index d3a7fc6..86b6e11 100644 --- a/senf/Socket/Protocols/UN/UNAddressing.test.cc +++ b/senf/Socket/Protocols/UN/UNAddressing.test.cc @@ -28,10 +28,10 @@ // Custom includes #include "UNAddressing.hh" -#include "../AddressExceptions.hh" +#include #include -#include "../../../Utils/auto_unit_test.hh" +#include #include #define prefix_ diff --git a/senf/Socket/Protocols/UN/UNDatagramSocketHandle.cc b/senf/Socket/Protocols/UN/UNDatagramSocketHandle.cc index 895cf63..f493907 100644 --- a/senf/Socket/Protocols/UN/UNDatagramSocketHandle.cc +++ b/senf/Socket/Protocols/UN/UNDatagramSocketHandle.cc @@ -31,7 +31,7 @@ #include #include -#include "../../../Utils/Exception.hh" +#include //#include "UNDatagramSocketHandle.mpp" #define prefix_ diff --git a/senf/Socket/Protocols/UN/UNDatagramSocketHandle.hh b/senf/Socket/Protocols/UN/UNDatagramSocketHandle.hh index b57996d..f1c1f49 100644 --- a/senf/Socket/Protocols/UN/UNDatagramSocketHandle.hh +++ b/senf/Socket/Protocols/UN/UNDatagramSocketHandle.hh @@ -29,11 +29,11 @@ // Custom includes #include "UNAddressing.hh" #include "UNSocketProtocol.hh" -#include "../../../Socket/Protocols/BSDSocketProtocol.hh" -#include "../../../Socket/FramingPolicy.hh" -#include "../../../Socket/CommunicationPolicy.hh" -#include "../../../Socket/ReadWritePolicy.hh" -#include "../../../Socket/ProtocolClientSocketHandle.hh" +#include +#include +#include +#include +#include //#include "UNDatagramSocketHandle.mpp" ///////////////////////////////hh.p//////////////////////////////////////// diff --git a/senf/Socket/Protocols/UN/UNDatagramSocketHandle.test.cc b/senf/Socket/Protocols/UN/UNDatagramSocketHandle.test.cc index 2297336..1db514b 100644 --- a/senf/Socket/Protocols/UN/UNDatagramSocketHandle.test.cc +++ b/senf/Socket/Protocols/UN/UNDatagramSocketHandle.test.cc @@ -29,7 +29,7 @@ // Custom includes #include "UNDatagramSocketHandle.hh" -#include "../../../Utils/auto_unit_test.hh" +#include #include #define prefix_ diff --git a/senf/Socket/Protocols/UN/UNSocketProtocol.cc b/senf/Socket/Protocols/UN/UNSocketProtocol.cc index 9a4075c..ff0f217 100644 --- a/senf/Socket/Protocols/UN/UNSocketProtocol.cc +++ b/senf/Socket/Protocols/UN/UNSocketProtocol.cc @@ -31,8 +31,8 @@ #include #include #include // for SIOCINQ / SIOCOUTQ -#include "../../../Utils/Logger/SenfLog.hh" -#include "../../../Utils/Exception.hh" +#include +#include //#include "UNSocketProtocol.mpp" #define prefix_ diff --git a/senf/Socket/Protocols/UN/UNSocketProtocol.hh b/senf/Socket/Protocols/UN/UNSocketProtocol.hh index 83bd3d1..da0cf6e 100644 --- a/senf/Socket/Protocols/UN/UNSocketProtocol.hh +++ b/senf/Socket/Protocols/UN/UNSocketProtocol.hh @@ -27,10 +27,10 @@ #define HH_SENF_Socket_Protocols_UN_UNSocketProtocol_ 1 // Custom includes -#include "../../../Socket/SocketProtocol.hh" +#include #include "UNAddressing.hh" -#include "../../../Socket/ClientSocketHandle.hh" -#include "../../../Socket/CommunicationPolicy.hh" +#include +#include //#include "UNSocketProtocol.mpp" ///////////////////////////////hh.p//////////////////////////////////////// diff --git a/senf/Socket/Protocols/UN/UNSocketProtocol.test.cc b/senf/Socket/Protocols/UN/UNSocketProtocol.test.cc index 2a7d4e4..57c1bb6 100644 --- a/senf/Socket/Protocols/UN/UNSocketProtocol.test.cc +++ b/senf/Socket/Protocols/UN/UNSocketProtocol.test.cc @@ -29,7 +29,7 @@ // Custom includes #include "UNSocketProtocol.hh" -#include "../../../Utils/auto_unit_test.hh" +#include #include #define prefix_ diff --git a/senf/Socket/Protocols/UN/main.test.cc b/senf/Socket/Protocols/UN/main.test.cc index 190483a..9f91d17 100644 --- a/senf/Socket/Protocols/UN/main.test.cc +++ b/senf/Socket/Protocols/UN/main.test.cc @@ -27,7 +27,7 @@ // Custom includes #define BOOST_AUTO_TEST_MAIN -#include "../../../Utils/auto_unit_test.hh" +#include #include #define prefix_ diff --git a/senf/Socket/Protocols/main.test.cc b/senf/Socket/Protocols/main.test.cc index b7b129a..9f91d17 100644 --- a/senf/Socket/Protocols/main.test.cc +++ b/senf/Socket/Protocols/main.test.cc @@ -27,7 +27,7 @@ // Custom includes #define BOOST_AUTO_TEST_MAIN -#include "../../Utils/auto_unit_test.hh" +#include #include #define prefix_ diff --git a/senf/Socket/ServerSocketHandle.test.cc b/senf/Socket/ServerSocketHandle.test.cc index 54963ea..181d1aa 100644 --- a/senf/Socket/ServerSocketHandle.test.cc +++ b/senf/Socket/ServerSocketHandle.test.cc @@ -32,7 +32,7 @@ #include "SocketProtocol.test.hh" #include "AddressingPolicy.hh" -#include "../Utils/auto_unit_test.hh" +#include #include #define prefix_ diff --git a/senf/Socket/SocketHandle.cc b/senf/Socket/SocketHandle.cc index aa0cf61..517ee9e 100644 --- a/senf/Socket/SocketHandle.cc +++ b/senf/Socket/SocketHandle.cc @@ -30,7 +30,7 @@ // Custom includes #include #include -#include "../Utils/TypeInfo.hh" +#include //#include "SocketHandle.mpp" #define prefix_ diff --git a/senf/Socket/SocketHandle.cci b/senf/Socket/SocketHandle.cci index ec22ca3..17b94b7 100644 --- a/senf/Socket/SocketHandle.cci +++ b/senf/Socket/SocketHandle.cci @@ -27,8 +27,8 @@ #include "SocketHandle.ih" // Custom includes -#include "../Utils/senfassert.hh" -#include "../Utils/Exception.hh" +#include +#include #include "SocketProtocol.hh" #define prefix_ inline diff --git a/senf/Socket/SocketHandle.ct b/senf/Socket/SocketHandle.ct index 7e66f31..e8c362c 100644 --- a/senf/Socket/SocketHandle.ct +++ b/senf/Socket/SocketHandle.ct @@ -28,7 +28,7 @@ // Custom includes #include -#include "../Utils/TypeInfo.hh" +#include #define prefix_ ///////////////////////////////ct.p//////////////////////////////////////// diff --git a/senf/Socket/SocketHandle.cti b/senf/Socket/SocketHandle.cti index bc3f7be..ff93a02 100644 --- a/senf/Socket/SocketHandle.cti +++ b/senf/Socket/SocketHandle.cti @@ -28,8 +28,8 @@ // Custom includes #include -#include "../Utils/senfassert.hh" -#include "../Utils/TypeInfo.hh" +#include +#include #define prefix_ inline ///////////////////////////////cti.p/////////////////////////////////////// diff --git a/senf/Socket/SocketHandle.test.cc b/senf/Socket/SocketHandle.test.cc index b4d8e5c..72fc952 100644 --- a/senf/Socket/SocketHandle.test.cc +++ b/senf/Socket/SocketHandle.test.cc @@ -31,7 +31,7 @@ #include "SocketProtocol.test.hh" #include "AddressingPolicy.hh" -#include "../Utils/auto_unit_test.hh" +#include #include #define prefix_ diff --git a/senf/Socket/SocketPolicy.ct b/senf/Socket/SocketPolicy.ct index fa9ca77..5072d64 100644 --- a/senf/Socket/SocketPolicy.ct +++ b/senf/Socket/SocketPolicy.ct @@ -27,7 +27,7 @@ #include "SocketPolicy.ih" // Custom includes -#include "../Utils/Exception.hh" +#include #define prefix_ ///////////////////////////////ct.p//////////////////////////////////////// diff --git a/senf/Socket/SocketPolicy.ih b/senf/Socket/SocketPolicy.ih index b335280..eee6f0d 100644 --- a/senf/Socket/SocketPolicy.ih +++ b/senf/Socket/SocketPolicy.ih @@ -50,8 +50,8 @@ #include #include // for enable_if -#include "../Utils/mpl.hh" -#include "../Utils/pool_alloc_mixin.hh" +#include +#include ///////////////////////////////ih.p//////////////////////////////////////// diff --git a/senf/Socket/SocketPolicy.test.cc b/senf/Socket/SocketPolicy.test.cc index 2e70df9..de28327 100644 --- a/senf/Socket/SocketPolicy.test.cc +++ b/senf/Socket/SocketPolicy.test.cc @@ -33,7 +33,7 @@ #include "SocketPolicy.hh" -#include "../Utils/auto_unit_test.hh" +#include #include #define prefix_ diff --git a/senf/Socket/SocketProtocol.cci b/senf/Socket/SocketProtocol.cci index 372ef3e..51fd4e2 100644 --- a/senf/Socket/SocketProtocol.cci +++ b/senf/Socket/SocketProtocol.cci @@ -27,7 +27,7 @@ //#include "SocketProtocol.ih" // Custom includes -#include "../Utils/senfassert.hh" +#include #define prefix_ inline ///////////////////////////////cci.p/////////////////////////////////////// diff --git a/senf/Socket/SocketProtocol.test.cc b/senf/Socket/SocketProtocol.test.cc index 888f981..89e1a10 100644 --- a/senf/Socket/SocketProtocol.test.cc +++ b/senf/Socket/SocketProtocol.test.cc @@ -30,7 +30,7 @@ #include "SocketProtocol.hh" #include "SocketPolicy.hh" -#include "../Utils/auto_unit_test.hh" +#include #include #define prefix_ diff --git a/senf/Socket/main.test.cc b/senf/Socket/main.test.cc index d2f37be..9f91d17 100644 --- a/senf/Socket/main.test.cc +++ b/senf/Socket/main.test.cc @@ -27,7 +27,7 @@ // Custom includes #define BOOST_AUTO_TEST_MAIN -#include "../Utils/auto_unit_test.hh" +#include #include #define prefix_ diff --git a/senf/Utils/Buffer.hh b/senf/Utils/Buffer.hh index 4510010..ad4906c 100644 --- a/senf/Utils/Buffer.hh +++ b/senf/Utils/Buffer.hh @@ -27,7 +27,7 @@ #define HH_SENF_Utils_Buffer_ 1 // Custom includes -#include "../config.hh" +#include //#include "Buffer.mpp" ///////////////////////////////hh.p//////////////////////////////////////// diff --git a/senf/Utils/Buffer.test.cc b/senf/Utils/Buffer.test.cc index 72a314c..579236f 100644 --- a/senf/Utils/Buffer.test.cc +++ b/senf/Utils/Buffer.test.cc @@ -29,7 +29,7 @@ // Custom includes #include "Buffer.hh" -#include "../Utils/auto_unit_test.hh" +#include #include #define prefix_ diff --git a/senf/Utils/Console/Config.cc b/senf/Utils/Console/Config.cc index f844f8a..66a7a19 100644 --- a/senf/Utils/Console/Config.cc +++ b/senf/Utils/Console/Config.cc @@ -27,7 +27,7 @@ #include "Config.ih" // Custom includes -#include "../../Utils/membind.hh" +#include //#include "Config.mpp" #define prefix_ diff --git a/senf/Utils/Console/Config.cci b/senf/Utils/Console/Config.cci index 9988f03..b9f2c75 100644 --- a/senf/Utils/Console/Config.cci +++ b/senf/Utils/Console/Config.cci @@ -26,7 +26,7 @@ #include "Config.ih" // Custom includes -#include "../../Utils/membind.hh" +#include #define prefix_ inline ///////////////////////////////cci.p/////////////////////////////////////// diff --git a/senf/Utils/Console/Config.ih b/senf/Utils/Console/Config.ih index d85a646..18c7293 100644 --- a/senf/Utils/Console/Config.ih +++ b/senf/Utils/Console/Config.ih @@ -30,8 +30,8 @@ #include #include #include "Executor.hh" -#include "../../Utils/intrusive_refcount.hh" -#include "../../Utils/DiscardStream.hh" +#include +#include ///////////////////////////////ih.p//////////////////////////////////////// diff --git a/senf/Utils/Console/Config.test.cc b/senf/Utils/Console/Config.test.cc index daefcca..2058a54 100644 --- a/senf/Utils/Console/Config.test.cc +++ b/senf/Utils/Console/Config.test.cc @@ -34,7 +34,7 @@ #include "ProgramOptions.hh" #include -#include "../../Utils/auto_unit_test.hh" +#include #include #define prefix_ diff --git a/senf/Utils/Console/ConfigFile.test.cc b/senf/Utils/Console/ConfigFile.test.cc index 74960a6..3f635a6 100644 --- a/senf/Utils/Console/ConfigFile.test.cc +++ b/senf/Utils/Console/ConfigFile.test.cc @@ -33,7 +33,7 @@ #include "ParsedCommand.hh" #include -#include "../../Utils/auto_unit_test.hh" +#include #include #define prefix_ diff --git a/senf/Utils/Console/Executor.cc b/senf/Utils/Console/Executor.cc index 49e7eb9..8d7e59a 100644 --- a/senf/Utils/Console/Executor.cc +++ b/senf/Utils/Console/Executor.cc @@ -32,10 +32,10 @@ #include #include #include -#include "../../Utils/senfassert.hh" -#include "../../Utils/Range.hh" -#include "../../Utils/String.hh" -#include "../../Utils/range.hh" +#include +#include +#include +#include #include "Server.hh" //#include "Executor.mpp" diff --git a/senf/Utils/Console/Executor.hh b/senf/Utils/Console/Executor.hh index cb1fab1..41016ec 100644 --- a/senf/Utils/Console/Executor.hh +++ b/senf/Utils/Console/Executor.hh @@ -29,7 +29,7 @@ // Custom includes #include #include "Parse.hh" -#include "../../Utils/Logger/SenfLog.hh" +#include #include "Node.hh" //#include "Executor.mpp" diff --git a/senf/Utils/Console/Executor.test.cc b/senf/Utils/Console/Executor.test.cc index 3198490..80e2653 100644 --- a/senf/Utils/Console/Executor.test.cc +++ b/senf/Utils/Console/Executor.test.cc @@ -31,7 +31,7 @@ #include #include "Executor.hh" -#include "../../Utils/auto_unit_test.hh" +#include #include #define prefix_ diff --git a/senf/Utils/Console/LineEditor.cc b/senf/Utils/Console/LineEditor.cc index 00faa8b..8235f71 100644 --- a/senf/Utils/Console/LineEditor.cc +++ b/senf/Utils/Console/LineEditor.cc @@ -27,8 +27,8 @@ //#include "LineEditor.ih" // Custom includes -#include "../Logger/SenfLog.hh" -#include "../../Utils/range.hh" +#include +#include //#include "LineEditor.mpp" #define prefix_ diff --git a/senf/Utils/Console/LineEditor.hh b/senf/Utils/Console/LineEditor.hh index 0360cd9..cbe33f3 100644 --- a/senf/Utils/Console/LineEditor.hh +++ b/senf/Utils/Console/LineEditor.hh @@ -28,8 +28,8 @@ // Custom includes #include -#include "../Termlib/TelnetTerminal.hh" -#include "../Termlib/Editor.hh" +#include +#include #include "Server.hh" //#include "LineEditor.mpp" diff --git a/senf/Utils/Console/Node.cc b/senf/Utils/Console/Node.cc index 335eb73..0b143dd 100644 --- a/senf/Utils/Console/Node.cc +++ b/senf/Utils/Console/Node.cc @@ -25,7 +25,7 @@ #include "Node.hh" #include "Node.ih" -#include "../../Utils/range.hh" +#include // Custom includes diff --git a/senf/Utils/Console/Node.cci b/senf/Utils/Console/Node.cci index f1935b3..c7107f1 100644 --- a/senf/Utils/Console/Node.cci +++ b/senf/Utils/Console/Node.cci @@ -26,7 +26,7 @@ #include "Node.ih" // Custom includes -#include "../../Utils/senfassert.hh" +#include #define prefix_ inline ///////////////////////////////cci.p/////////////////////////////////////// diff --git a/senf/Utils/Console/Node.hh b/senf/Utils/Console/Node.hh index bfccb7a..1d7cdb7 100644 --- a/senf/Utils/Console/Node.hh +++ b/senf/Utils/Console/Node.hh @@ -207,10 +207,10 @@ #include #include #include -#include "../../Utils/Exception.hh" -#include "../../Utils/mpl.hh" -#include "../../Utils/Logger/SenfLog.hh" -#include "../../Utils/type_traits.hh" +#include +#include +#include +#include #include "Parse.hh" //#include "Node.mpp" diff --git a/senf/Utils/Console/Node.test.cc b/senf/Utils/Console/Node.test.cc index f88b91d..46bf919 100644 --- a/senf/Utils/Console/Node.test.cc +++ b/senf/Utils/Console/Node.test.cc @@ -31,7 +31,7 @@ #include "Node.hh" #include -#include "../../Utils/auto_unit_test.hh" +#include #include #define prefix_ diff --git a/senf/Utils/Console/OverloadedCommand.hh b/senf/Utils/Console/OverloadedCommand.hh index 3be6b42..349159c 100644 --- a/senf/Utils/Console/OverloadedCommand.hh +++ b/senf/Utils/Console/OverloadedCommand.hh @@ -30,7 +30,7 @@ #include "Node.hh" #include #include -#include "../../Utils/intrusive_refcount.hh" +#include //#include "OverloadedCommand.mpp" ///////////////////////////////hh.p//////////////////////////////////////// diff --git a/senf/Utils/Console/OverloadedCommand.test.cc b/senf/Utils/Console/OverloadedCommand.test.cc index af27d87..bce2c86 100644 --- a/senf/Utils/Console/OverloadedCommand.test.cc +++ b/senf/Utils/Console/OverloadedCommand.test.cc @@ -30,7 +30,7 @@ #include #include "OverloadedCommand.hh" -#include "../../Utils/auto_unit_test.hh" +#include #include #define prefix_ diff --git a/senf/Utils/Console/Parse.cc b/senf/Utils/Console/Parse.cc index 8723510..40a61fc 100644 --- a/senf/Utils/Console/Parse.cc +++ b/senf/Utils/Console/Parse.cc @@ -31,8 +31,8 @@ #include #include #include -#include "../../Utils/Exception.hh" -#include "../../Utils/senfassert.hh" +#include +#include //#include "Parse.mpp" #define prefix_ diff --git a/senf/Utils/Console/Parse.cci b/senf/Utils/Console/Parse.cci index fcbb81f..794b91e 100644 --- a/senf/Utils/Console/Parse.cci +++ b/senf/Utils/Console/Parse.cci @@ -27,7 +27,7 @@ // (disabled) #include "Parse.ih" // Custom includes -#include "../../Utils/senfassert.hh" +#include #define prefix_ inline ///////////////////////////////cci.p/////////////////////////////////////// diff --git a/senf/Utils/Console/Parse.hh b/senf/Utils/Console/Parse.hh index 59670ed..d90a367 100644 --- a/senf/Utils/Console/Parse.hh +++ b/senf/Utils/Console/Parse.hh @@ -197,8 +197,8 @@ #include #include #include -#include "../../Utils/safe_bool.hh" -#include "../../Utils/Exception.hh" +#include +#include //#include "Parse.mpp" ///////////////////////////////hh.p//////////////////////////////////////// diff --git a/senf/Utils/Console/Parse.ih b/senf/Utils/Console/Parse.ih index fe95008..3af920f 100644 --- a/senf/Utils/Console/Parse.ih +++ b/senf/Utils/Console/Parse.ih @@ -28,12 +28,12 @@ // Custom includes #include -#include "../../config.hh" +#include #include #include #include #include -#include "../../Utils/Phoenix.hh" +#include ///////////////////////////////ih.p//////////////////////////////////////// diff --git a/senf/Utils/Console/Parse.test.cc b/senf/Utils/Console/Parse.test.cc index fd15211..17ff943 100644 --- a/senf/Utils/Console/Parse.test.cc +++ b/senf/Utils/Console/Parse.test.cc @@ -33,9 +33,9 @@ #include #include "Parse.hh" #include "Parse.ih" -#include "../../Utils/String.hh" +#include -#include "../../Utils/auto_unit_test.hh" +#include #include #define prefix_ diff --git a/senf/Utils/Console/ParsedCommand.cti b/senf/Utils/Console/ParsedCommand.cti index a35a827..2ef3adc 100644 --- a/senf/Utils/Console/ParsedCommand.cti +++ b/senf/Utils/Console/ParsedCommand.cti @@ -26,9 +26,9 @@ #include "ParsedCommand.ih" // Custom includes -#include "../../Utils/membind.hh" +#include #include -#include "../../Utils/parameter.hh" +#include #define prefix_ inline ///////////////////////////////cti.p/////////////////////////////////////// diff --git a/senf/Utils/Console/ParsedCommand.hh b/senf/Utils/Console/ParsedCommand.hh index 45276cb..0fdccd7 100644 --- a/senf/Utils/Console/ParsedCommand.hh +++ b/senf/Utils/Console/ParsedCommand.hh @@ -37,10 +37,10 @@ #include #include #include -#include "../../config.hh" +#include #include "OverloadedCommand.hh" #include "Traits.hh" -#include "../../Utils/type_traits.hh" +#include #include "ParsedCommand.ih" #include "ParsedCommand.mpp" diff --git a/senf/Utils/Console/ParsedCommand.test.cc b/senf/Utils/Console/ParsedCommand.test.cc index 54c9f7c..31f8cee 100644 --- a/senf/Utils/Console/ParsedCommand.test.cc +++ b/senf/Utils/Console/ParsedCommand.test.cc @@ -34,7 +34,7 @@ #include "Parse.hh" #include "ScopedDirectory.hh" -#include "../../Utils/auto_unit_test.hh" +#include #include #define prefix_ diff --git a/senf/Utils/Console/ProgramOptions.cc b/senf/Utils/Console/ProgramOptions.cc index 951c5f0..e68ce7d 100644 --- a/senf/Utils/Console/ProgramOptions.cc +++ b/senf/Utils/Console/ProgramOptions.cc @@ -29,7 +29,7 @@ // Custom includes #include #include -#include "../../Utils/range.hh" +#include #include "OverloadedCommand.hh" //#include "ProgramOptions.mpp" diff --git a/senf/Utils/Console/ProgramOptions.test.cc b/senf/Utils/Console/ProgramOptions.test.cc index 5d18e9e..d063473 100644 --- a/senf/Utils/Console/ProgramOptions.test.cc +++ b/senf/Utils/Console/ProgramOptions.test.cc @@ -31,7 +31,7 @@ #include "ScopedDirectory.hh" #include "ParsedCommand.hh" -#include "../../Utils/auto_unit_test.hh" +#include #include #define prefix_ diff --git a/senf/Utils/Console/STLSupport.test.cc b/senf/Utils/Console/STLSupport.test.cc index 4916987..c920f62 100644 --- a/senf/Utils/Console/STLSupport.test.cc +++ b/senf/Utils/Console/STLSupport.test.cc @@ -34,7 +34,7 @@ #include "Parse.hh" #include "ScopedDirectory.hh" -#include "../../Utils/auto_unit_test.hh" +#include #include #define prefix_ diff --git a/senf/Utils/Console/ScopedDirectory.test.cc b/senf/Utils/Console/ScopedDirectory.test.cc index f675893..f94ebeb 100644 --- a/senf/Utils/Console/ScopedDirectory.test.cc +++ b/senf/Utils/Console/ScopedDirectory.test.cc @@ -31,7 +31,7 @@ #include "ScopedDirectory.hh" #include -#include "../../Utils/auto_unit_test.hh" +#include #include #define prefix_ diff --git a/senf/Utils/Console/Server.cc b/senf/Utils/Console/Server.cc index a1bad60..6ed4b3b 100644 --- a/senf/Utils/Console/Server.cc +++ b/senf/Utils/Console/Server.cc @@ -33,9 +33,9 @@ #include #include #include -#include "../../Utils/senfassert.hh" -#include "../../Utils/membind.hh" -#include "../../Utils/Logger/SenfLog.hh" +#include +#include +#include #include "LineEditor.hh" #include "ScopedDirectory.hh" #include "Sysdir.hh" diff --git a/senf/Utils/Console/Server.hh b/senf/Utils/Console/Server.hh index 53aa969..c538a5b 100644 --- a/senf/Utils/Console/Server.hh +++ b/senf/Utils/Console/Server.hh @@ -31,15 +31,15 @@ #include #include #include -#include "../../Utils/intrusive_refcount.hh" -#include "../../Socket/Protocols/INet/TCPSocketHandle.hh" -#include "../../Socket/ServerSocketHandle.hh" -#include "../../Scheduler/Scheduler.hh" -#include "../../Scheduler/ReadHelper.hh" +#include +#include +#include +#include +#include #include "Parse.hh" #include "Executor.hh" -#include "../../Socket/Protocols/INet/INetAddressing.hh" -#include "../../Utils/Logger.hh" +#include +#include //#include "Server.mpp" #include "Server.ih" diff --git a/senf/Utils/Console/Server.test.cc b/senf/Utils/Console/Server.test.cc index e81aa3d..45bb758 100644 --- a/senf/Utils/Console/Server.test.cc +++ b/senf/Utils/Console/Server.test.cc @@ -29,7 +29,7 @@ // Custom includes #include "Server.hh" -#include "../../Utils/auto_unit_test.hh" +#include #include #define prefix_ diff --git a/senf/Utils/Console/Traits.cc b/senf/Utils/Console/Traits.cc index c1e1cbc..6f75d60 100644 --- a/senf/Utils/Console/Traits.cc +++ b/senf/Utils/Console/Traits.cc @@ -27,7 +27,7 @@ #include "Traits.ih" // Custom includes -#include "../../Utils/senfassert.hh" +#include //#include "Traits.mpp" #define prefix_ diff --git a/senf/Utils/Console/Traits.cti b/senf/Utils/Console/Traits.cti index db9163f..70c8869 100644 --- a/senf/Utils/Console/Traits.cti +++ b/senf/Utils/Console/Traits.cti @@ -28,7 +28,7 @@ // Custom includes #include #include -#include "../../Utils/TypeInfo.hh" +#include #define prefix_ inline ///////////////////////////////cti.p/////////////////////////////////////// diff --git a/senf/Utils/Console/Traits.hh b/senf/Utils/Console/Traits.hh index da5eb60..e60faed 100644 --- a/senf/Utils/Console/Traits.hh +++ b/senf/Utils/Console/Traits.hh @@ -30,7 +30,7 @@ #include #include #include -#include "../../Utils/intrusive_refcount.hh" +#include #include "Parse.hh" #include "Node.hh" diff --git a/senf/Utils/Console/Traits.ih b/senf/Utils/Console/Traits.ih index 40e55e5..85213bb 100644 --- a/senf/Utils/Console/Traits.ih +++ b/senf/Utils/Console/Traits.ih @@ -34,7 +34,7 @@ #include #include #include -#include "../../Utils/singleton.hh" +#include ///////////////////////////////ih.p//////////////////////////////////////// diff --git a/senf/Utils/Console/Traits.test.cc b/senf/Utils/Console/Traits.test.cc index 1e77cf7..b8d1d1f 100644 --- a/senf/Utils/Console/Traits.test.cc +++ b/senf/Utils/Console/Traits.test.cc @@ -33,7 +33,7 @@ #include "Parse.hh" #include "ScopedDirectory.hh" -#include "../../Utils/auto_unit_test.hh" +#include #include #define prefix_ diff --git a/senf/Utils/Console/UDPServer.cc b/senf/Utils/Console/UDPServer.cc index 73834be..7f77884 100644 --- a/senf/Utils/Console/UDPServer.cc +++ b/senf/Utils/Console/UDPServer.cc @@ -28,7 +28,7 @@ // Custom includes #include -#include "../membind.hh" +#include //#include "UDPServer.mpp" #define prefix_ diff --git a/senf/Utils/Console/UDPServer.hh b/senf/Utils/Console/UDPServer.hh index f2024c1..0cf3834 100644 --- a/senf/Utils/Console/UDPServer.hh +++ b/senf/Utils/Console/UDPServer.hh @@ -28,9 +28,9 @@ // Custom includes #include -#include "../../Socket/Protocols/INet/UDPSocketHandle.hh" -#include "../Logger/SenfLog.hh" -#include "../../Scheduler/Scheduler.hh" +#include +#include +#include #include "Parse.hh" #include "Executor.hh" diff --git a/senf/Utils/Console/UDPServer.test.cc b/senf/Utils/Console/UDPServer.test.cc index e35f4d0..ca59bfa 100644 --- a/senf/Utils/Console/UDPServer.test.cc +++ b/senf/Utils/Console/UDPServer.test.cc @@ -29,7 +29,7 @@ // Custom includes #include "UDPServer.hh" -#include "../../Utils/auto_unit_test.hh" +#include #include #define prefix_ diff --git a/senf/Utils/Console/Variables.test.cc b/senf/Utils/Console/Variables.test.cc index cff60d1..cd40365 100644 --- a/senf/Utils/Console/Variables.test.cc +++ b/senf/Utils/Console/Variables.test.cc @@ -31,7 +31,7 @@ #include #include "Console.hh" -#include "../../Utils/auto_unit_test.hh" +#include #include #define prefix_ diff --git a/senf/Utils/Console/main.test.cc b/senf/Utils/Console/main.test.cc index b7b129a..9f91d17 100644 --- a/senf/Utils/Console/main.test.cc +++ b/senf/Utils/Console/main.test.cc @@ -27,7 +27,7 @@ // Custom includes #define BOOST_AUTO_TEST_MAIN -#include "../../Utils/auto_unit_test.hh" +#include #include #define prefix_ diff --git a/senf/Utils/Daemon.hh b/senf/Utils/Daemon.hh index 4bd63b0..8a663ee 100644 --- a/senf/Utils/Daemon.hh +++ b/senf/Utils/Daemon.hh @@ -23,7 +23,7 @@ /** \file \brief Daemon public header */ -#include "Daemon/Daemon.hh" +#include // Local Variables: diff --git a/senf/Utils/Daemon/Daemon.cc b/senf/Utils/Daemon/Daemon.cc index 1b6e8ae..e705022 100644 --- a/senf/Utils/Daemon/Daemon.cc +++ b/senf/Utils/Daemon/Daemon.cc @@ -41,10 +41,10 @@ #include #include #include -#include "../Exception.hh" -#include "../membind.hh" -#include "../Backtrace.hh" -#include "../signalnames.hh" +#include +#include +#include +#include // #define __USE_GNU #include diff --git a/senf/Utils/Daemon/Daemon.hh b/senf/Utils/Daemon/Daemon.hh index f0d3e6b..38284d2 100644 --- a/senf/Utils/Daemon/Daemon.hh +++ b/senf/Utils/Daemon/Daemon.hh @@ -28,7 +28,7 @@ // Custom includes #include -#include "../Logger/SenfLog.hh" +#include //#include "Daemon.mpp" ///////////////////////////////hh.p//////////////////////////////////////// diff --git a/senf/Utils/Daemon/Daemon.ih b/senf/Utils/Daemon/Daemon.ih index 2198d03..eec1bd4 100644 --- a/senf/Utils/Daemon/Daemon.ih +++ b/senf/Utils/Daemon/Daemon.ih @@ -32,8 +32,8 @@ #include #include #include -#include "../../Scheduler/Scheduler.hh" -#include "../../Scheduler/SignalEvent.hh" +#include +#include ///////////////////////////////ih.p//////////////////////////////////////// diff --git a/senf/Utils/Daemon/Daemon.test.cc b/senf/Utils/Daemon/Daemon.test.cc index b62d7ba..838861c 100644 --- a/senf/Utils/Daemon/Daemon.test.cc +++ b/senf/Utils/Daemon/Daemon.test.cc @@ -34,11 +34,11 @@ #include #include #include "Daemon.hh" -#include "../Exception.hh" -#include "../Backtrace.hh" -#include "../../Scheduler/Scheduler.hh" +#include +#include +#include -#include "../auto_unit_test.hh" +#include #include #define prefix_ diff --git a/senf/Utils/Daemon/main.test.cc b/senf/Utils/Daemon/main.test.cc index b7b129a..9f91d17 100644 --- a/senf/Utils/Daemon/main.test.cc +++ b/senf/Utils/Daemon/main.test.cc @@ -27,7 +27,7 @@ // Custom includes #define BOOST_AUTO_TEST_MAIN -#include "../../Utils/auto_unit_test.hh" +#include #include #define prefix_ diff --git a/senf/Utils/DiscardStream.test.cc b/senf/Utils/DiscardStream.test.cc index 03c62b0..56dadd3 100644 --- a/senf/Utils/DiscardStream.test.cc +++ b/senf/Utils/DiscardStream.test.cc @@ -29,7 +29,7 @@ // Custom includes #include "DiscardStream.hh" -#include "../Utils/auto_unit_test.hh" +#include #include #define prefix_ diff --git a/senf/Utils/Exception.cc b/senf/Utils/Exception.cc index ee1ec18..caa13c4 100644 --- a/senf/Utils/Exception.cc +++ b/senf/Utils/Exception.cc @@ -29,7 +29,7 @@ // Custom includes #include #include -#include "../config.hh" +#include #include "Backtrace.hh" #define prefix_ diff --git a/senf/Utils/Exception.test.cc b/senf/Utils/Exception.test.cc index 0f0db82..ca3a04d 100644 --- a/senf/Utils/Exception.test.cc +++ b/senf/Utils/Exception.test.cc @@ -31,7 +31,7 @@ #include #include -#include "../Utils/auto_unit_test.hh" +#include #include #define prefix_ diff --git a/senf/Utils/IpChecksum.test.cc b/senf/Utils/IpChecksum.test.cc index ecdc127..59f8f41 100644 --- a/senf/Utils/IpChecksum.test.cc +++ b/senf/Utils/IpChecksum.test.cc @@ -29,7 +29,7 @@ // Custom includes #include "IpChecksum.hh" -#include "../Utils/auto_unit_test.hh" +#include #include #define prefix_ diff --git a/senf/Utils/IteratorTraits.test.cc b/senf/Utils/IteratorTraits.test.cc index 50ce1d8..c45084f 100644 --- a/senf/Utils/IteratorTraits.test.cc +++ b/senf/Utils/IteratorTraits.test.cc @@ -31,7 +31,7 @@ #include #include -#include "../Utils/auto_unit_test.hh" +#include #include #define prefix_ diff --git a/senf/Utils/Logger.hh b/senf/Utils/Logger.hh index c9e6c53..b081a79 100644 --- a/senf/Utils/Logger.hh +++ b/senf/Utils/Logger.hh @@ -23,7 +23,7 @@ /** \file \brief Logger public header */ -#include "Logger/Logger.hh" +#include // Local Variables: diff --git a/senf/Utils/Logger/AreaRegistry.cci b/senf/Utils/Logger/AreaRegistry.cci index 158c007..d748687 100644 --- a/senf/Utils/Logger/AreaRegistry.cci +++ b/senf/Utils/Logger/AreaRegistry.cci @@ -26,7 +26,7 @@ #include "AreaRegistry.ih" // Custom includes -#include "../TypeInfo.hh" +#include #include "Levels.hh" #include "StreamRegistry.hh" diff --git a/senf/Utils/Logger/AreaRegistry.hh b/senf/Utils/Logger/AreaRegistry.hh index 82a43ed..89b23e6 100644 --- a/senf/Utils/Logger/AreaRegistry.hh +++ b/senf/Utils/Logger/AreaRegistry.hh @@ -30,7 +30,7 @@ #include #include #include -#include "../singleton.hh" +#include //#include "AreaRegistry.mpp" #include "AreaRegistry.ih" diff --git a/senf/Utils/Logger/AreaRegistry.test.cc b/senf/Utils/Logger/AreaRegistry.test.cc index a21dd89..4487679 100644 --- a/senf/Utils/Logger/AreaRegistry.test.cc +++ b/senf/Utils/Logger/AreaRegistry.test.cc @@ -29,7 +29,7 @@ // Custom includes #include "main.test.hh" -#include "../../Utils/auto_unit_test.hh" +#include #include #define prefix_ diff --git a/senf/Utils/Logger/Config.ih b/senf/Utils/Logger/Config.ih index a850fde..d6c88c0 100644 --- a/senf/Utils/Logger/Config.ih +++ b/senf/Utils/Logger/Config.ih @@ -34,7 +34,7 @@ #include #include #include -#include "../preprocessor.hh" +#include ///////////////////////////////ih.p//////////////////////////////////////// diff --git a/senf/Utils/Logger/Config.test.cc b/senf/Utils/Logger/Config.test.cc index cecda34..346cdcb 100644 --- a/senf/Utils/Logger/Config.test.cc +++ b/senf/Utils/Logger/Config.test.cc @@ -29,7 +29,7 @@ // Custom includes #include "main.test.hh" -#include "../../Utils/auto_unit_test.hh" +#include #include #define prefix_ diff --git a/senf/Utils/Logger/FileTarget.cc b/senf/Utils/Logger/FileTarget.cc index c5aaa03..eda95c1 100644 --- a/senf/Utils/Logger/FileTarget.cc +++ b/senf/Utils/Logger/FileTarget.cc @@ -27,8 +27,8 @@ //#include "FileTarget.ih" // Custom includes -#include "../Console/Console.hh" -#include "../Exception.hh" +#include +#include #include //#include "FileTarget.mpp" diff --git a/senf/Utils/Logger/FileTarget.test.cc b/senf/Utils/Logger/FileTarget.test.cc index 65e26d0..3f45b10 100644 --- a/senf/Utils/Logger/FileTarget.test.cc +++ b/senf/Utils/Logger/FileTarget.test.cc @@ -32,7 +32,7 @@ #include "FileTarget.hh" #include "Logger.hh" -#include "../auto_unit_test.hh" +#include #include #define prefix_ diff --git a/senf/Utils/Logger/Log.test.cc b/senf/Utils/Logger/Log.test.cc index 64e6df5..f839255 100644 --- a/senf/Utils/Logger/Log.test.cc +++ b/senf/Utils/Logger/Log.test.cc @@ -29,7 +29,7 @@ // Custom includes #include "main.test.hh" -#include "../../Utils/auto_unit_test.hh" +#include #include #define prefix_ diff --git a/senf/Utils/Logger/LogFormat.cc b/senf/Utils/Logger/LogFormat.cc index 7901090..0f205a5 100644 --- a/senf/Utils/Logger/LogFormat.cc +++ b/senf/Utils/Logger/LogFormat.cc @@ -31,8 +31,8 @@ #include #include #include -#include "../../Scheduler/ClockService.hh" -#include "../Console/Console.hh" +#include +#include //#include "LogFormat.mpp" #define prefix_ diff --git a/senf/Utils/Logger/LogFormat.hh b/senf/Utils/Logger/LogFormat.hh index 4e79978..96bd3fa 100644 --- a/senf/Utils/Logger/LogFormat.hh +++ b/senf/Utils/Logger/LogFormat.hh @@ -29,7 +29,7 @@ // Custom includes #include #include "Target.hh" -#include "../Console/LazyDirectory.hh" +#include //#include "LogFormat.mpp" ///////////////////////////////hh.p//////////////////////////////////////// diff --git a/senf/Utils/Logger/Parameters.ih b/senf/Utils/Logger/Parameters.ih index 4941b79..98d00c0 100644 --- a/senf/Utils/Logger/Parameters.ih +++ b/senf/Utils/Logger/Parameters.ih @@ -36,7 +36,7 @@ #include #include #include -#include "../mpl.hh" +#include #include "Config.hh" #include "Target.hh" diff --git a/senf/Utils/Logger/Parameters.test.cc b/senf/Utils/Logger/Parameters.test.cc index 0d4dbf9..52a9656 100644 --- a/senf/Utils/Logger/Parameters.test.cc +++ b/senf/Utils/Logger/Parameters.test.cc @@ -29,7 +29,7 @@ // Custom includes #include "main.test.hh" -#include "../../Utils/auto_unit_test.hh" +#include #include #define prefix_ diff --git a/senf/Utils/Logger/SenfLog.hh b/senf/Utils/Logger/SenfLog.hh index 82b9464..86116e5 100644 --- a/senf/Utils/Logger/SenfLog.hh +++ b/senf/Utils/Logger/SenfLog.hh @@ -27,7 +27,7 @@ #define HH_SENF_Utils_Logger_SenfLog_ 1 // Custom includes -#include "../../config.hh" +#include #include "Logger.hh" //#include "SenfLog.mpp" diff --git a/senf/Utils/Logger/StreamRegistry.cci b/senf/Utils/Logger/StreamRegistry.cci index 531b0e0..cace8a1 100644 --- a/senf/Utils/Logger/StreamRegistry.cci +++ b/senf/Utils/Logger/StreamRegistry.cci @@ -26,7 +26,7 @@ #include "StreamRegistry.ih" // Custom includes -#include "../TypeInfo.hh" +#include #define prefix_ inline ///////////////////////////////cci.p/////////////////////////////////////// diff --git a/senf/Utils/Logger/StreamRegistry.hh b/senf/Utils/Logger/StreamRegistry.hh index 48e5c59..8821e3a 100644 --- a/senf/Utils/Logger/StreamRegistry.hh +++ b/senf/Utils/Logger/StreamRegistry.hh @@ -32,7 +32,7 @@ #include #include #include "Levels.hh" -#include "../singleton.hh" +#include //#include "StreamRegistry.mpp" #include "StreamRegistry.ih" diff --git a/senf/Utils/Logger/StreamRegistry.test.cc b/senf/Utils/Logger/StreamRegistry.test.cc index a5bd138..793b9a9 100644 --- a/senf/Utils/Logger/StreamRegistry.test.cc +++ b/senf/Utils/Logger/StreamRegistry.test.cc @@ -29,7 +29,7 @@ // Custom includes #include "main.test.hh" -#include "../../Utils/auto_unit_test.hh" +#include #include #define prefix_ diff --git a/senf/Utils/Logger/SyslogTarget.cc b/senf/Utils/Logger/SyslogTarget.cc index b4ba15d..dc49247 100644 --- a/senf/Utils/Logger/SyslogTarget.cc +++ b/senf/Utils/Logger/SyslogTarget.cc @@ -27,7 +27,7 @@ //#include "SyslogTarget.ih" // Custom includes -#include "../Console/Console.hh" +#include //#include "SyslogTarget.mpp" #define prefix_ diff --git a/senf/Utils/Logger/SyslogTarget.test.cc b/senf/Utils/Logger/SyslogTarget.test.cc index 82d89dc..5d042fe 100644 --- a/senf/Utils/Logger/SyslogTarget.test.cc +++ b/senf/Utils/Logger/SyslogTarget.test.cc @@ -29,7 +29,7 @@ // Custom includes #include "Logger.hh" -#include "../../Utils/auto_unit_test.hh" +#include #include #define prefix_ diff --git a/senf/Utils/Logger/SyslogUDPTarget.cc b/senf/Utils/Logger/SyslogUDPTarget.cc index cd8d6b3..d1e70a3 100644 --- a/senf/Utils/Logger/SyslogUDPTarget.cc +++ b/senf/Utils/Logger/SyslogUDPTarget.cc @@ -30,7 +30,7 @@ #include #include #include -#include "../Console/Console.hh" +#include //#include "SyslogUDPTarget.mpp" #define prefix_ diff --git a/senf/Utils/Logger/SyslogUDPTarget.cci b/senf/Utils/Logger/SyslogUDPTarget.cci index f753955..847e742 100644 --- a/senf/Utils/Logger/SyslogUDPTarget.cci +++ b/senf/Utils/Logger/SyslogUDPTarget.cci @@ -26,8 +26,8 @@ //#include "SyslogUDPTarget.ih" // Custom includes -#include "../../Socket/Protocols/INet/ConnectedUDPSocketHandle.hh" -#include "../String.hh" +#include +#include #define prefix_ inline ///////////////////////////////cci.p/////////////////////////////////////// diff --git a/senf/Utils/Logger/SyslogUDPTarget.hh b/senf/Utils/Logger/SyslogUDPTarget.hh index 71732d5..a11f84c 100644 --- a/senf/Utils/Logger/SyslogUDPTarget.hh +++ b/senf/Utils/Logger/SyslogUDPTarget.hh @@ -29,11 +29,11 @@ // Custom includes #include "SyslogTarget.hh" #include "LogFormat.hh" -#include "../../Socket/Protocols/INet/INetAddressing.hh" -#include "../../Socket/ClientSocketHandle.hh" -#include "../../Socket/FramingPolicy.hh" -#include "../../Socket/ReadWritePolicy.hh" -#include "../../Socket/CommunicationPolicy.hh" +#include +#include +#include +#include +#include //#include "SyslogUDPTarget.mpp" ///////////////////////////////hh.p//////////////////////////////////////// diff --git a/senf/Utils/Logger/SyslogUDPTarget.test.cc b/senf/Utils/Logger/SyslogUDPTarget.test.cc index eff65c1..1f39fe5 100644 --- a/senf/Utils/Logger/SyslogUDPTarget.test.cc +++ b/senf/Utils/Logger/SyslogUDPTarget.test.cc @@ -28,10 +28,10 @@ // Custom includes #include "SyslogUDPTarget.hh" -#include "../../Socket/Protocols/INet/UDPSocketHandle.hh" +#include #include "Logger.hh" -#include "../../Utils/auto_unit_test.hh" +#include #include #define prefix_ diff --git a/senf/Utils/Logger/Target.cc b/senf/Utils/Logger/Target.cc index 9c883dc..e60080b 100644 --- a/senf/Utils/Logger/Target.cc +++ b/senf/Utils/Logger/Target.cc @@ -30,9 +30,9 @@ #include #include #include "ConsoleTarget.hh" -#include "../Console/Console.hh" -#include "../Console/Sysdir.hh" -#include "../membind.hh" +#include +#include +#include //#include "Target.mpp" #define prefix_ diff --git a/senf/Utils/Logger/Target.hh b/senf/Utils/Logger/Target.hh index dbbad15..23f3ff2 100644 --- a/senf/Utils/Logger/Target.hh +++ b/senf/Utils/Logger/Target.hh @@ -31,12 +31,12 @@ #include #include #include -#include "../singleton.hh" -#include "../mpl.hh" +#include +#include #include "StreamRegistry.hh" -#include "../Exception.hh" +#include #include "TimeSource.hh" -#include "../Console/LazyDirectory.hh" +#include //#include "Target.mpp" ///////////////////////////////hh.p//////////////////////////////////////// diff --git a/senf/Utils/Logger/Target.ih b/senf/Utils/Logger/Target.ih index 4b81e2e..324baff 100644 --- a/senf/Utils/Logger/Target.ih +++ b/senf/Utils/Logger/Target.ih @@ -31,8 +31,8 @@ #include #include #include -#include "../Console/LazyDirectory.hh" -#include "../Console/Parse.hh" +#include +#include ///////////////////////////////ih.p//////////////////////////////////////// diff --git a/senf/Utils/Logger/Target.test.cc b/senf/Utils/Logger/Target.test.cc index 1a643b0..311a421 100644 --- a/senf/Utils/Logger/Target.test.cc +++ b/senf/Utils/Logger/Target.test.cc @@ -30,7 +30,7 @@ #include #include "main.test.hh" -#include "../../Utils/auto_unit_test.hh" +#include #include #define prefix_ diff --git a/senf/Utils/Logger/TimeSource.cc b/senf/Utils/Logger/TimeSource.cc index f5baef9..e5b657c 100644 --- a/senf/Utils/Logger/TimeSource.cc +++ b/senf/Utils/Logger/TimeSource.cc @@ -28,8 +28,8 @@ // Custom includes #include -#include "../Exception.hh" -#include "../../Scheduler/ClockService.hh" +#include +#include //#include "TimeSource.mpp" #define prefix_ diff --git a/senf/Utils/Logger/TimeSource.hh b/senf/Utils/Logger/TimeSource.hh index 135230c..cc18474 100644 --- a/senf/Utils/Logger/TimeSource.hh +++ b/senf/Utils/Logger/TimeSource.hh @@ -29,7 +29,7 @@ // Custom includes #include #include -#include "../../config.hh" +#include //#include "TimeSource.mpp" ///////////////////////////////hh.p//////////////////////////////////////// diff --git a/senf/Utils/Logger/TimeSource.ih b/senf/Utils/Logger/TimeSource.ih index d1a73b1..e6becd4 100644 --- a/senf/Utils/Logger/TimeSource.ih +++ b/senf/Utils/Logger/TimeSource.ih @@ -28,7 +28,7 @@ // Custom includes #include -#include "../singleton.hh" +#include ///////////////////////////////ih.p//////////////////////////////////////// diff --git a/senf/Utils/Logger/main.test.cc b/senf/Utils/Logger/main.test.cc index b7b129a..9f91d17 100644 --- a/senf/Utils/Logger/main.test.cc +++ b/senf/Utils/Logger/main.test.cc @@ -27,7 +27,7 @@ // Custom includes #define BOOST_AUTO_TEST_MAIN -#include "../../Utils/auto_unit_test.hh" +#include #include #define prefix_ diff --git a/senf/Utils/Statistics.cc b/senf/Utils/Statistics.cc index a96b33b..9129c17 100644 --- a/senf/Utils/Statistics.cc +++ b/senf/Utils/Statistics.cc @@ -28,7 +28,7 @@ // Custom includes #include -#include "Console/Console.hh" +#include #include "StatisticsTargets.hh" //#include "Statistics.mpp" diff --git a/senf/Utils/Statistics.hh b/senf/Utils/Statistics.hh index 6409ab1..bc3b281 100644 --- a/senf/Utils/Statistics.hh +++ b/senf/Utils/Statistics.hh @@ -36,8 +36,8 @@ #include #include #include "Exception.hh" -#include "Logger/Logger.hh" -#include "Console/Console.hh" +#include +#include //#include "Statistics.mpp" ///////////////////////////////hh.p//////////////////////////////////////// diff --git a/senf/Utils/StatisticsTargets.cc b/senf/Utils/StatisticsTargets.cc index a131e36..f771789 100644 --- a/senf/Utils/StatisticsTargets.cc +++ b/senf/Utils/StatisticsTargets.cc @@ -28,7 +28,7 @@ // Custom includes #include -#include "Console/Console.hh" +#include #include "Statistics.hh" //#include "StatisticsTargets.mpp" diff --git a/senf/Utils/StatisticsTargets.hh b/senf/Utils/StatisticsTargets.hh index 93a2180..536f654 100644 --- a/senf/Utils/StatisticsTargets.hh +++ b/senf/Utils/StatisticsTargets.hh @@ -28,7 +28,7 @@ // Custom includes #include -#include "Logger/Logger.hh" +#include //#include "StatisticsTargets.mpp" #include "StatisticsTargets.ih" diff --git a/senf/Utils/Tags.test.cc b/senf/Utils/Tags.test.cc index 445c7ec..952d4b6 100644 --- a/senf/Utils/Tags.test.cc +++ b/senf/Utils/Tags.test.cc @@ -29,7 +29,7 @@ // Custom includes #include "Tags.hh" -#include "../Utils/auto_unit_test.hh" +#include #include #define prefix_ diff --git a/senf/Utils/Termlib/Telnet.cc b/senf/Utils/Termlib/Telnet.cc index 19b9058..df86304 100644 --- a/senf/Utils/Termlib/Telnet.cc +++ b/senf/Utils/Termlib/Telnet.cc @@ -28,8 +28,8 @@ // Custom includes #include -#include "../membind.hh" -#include "../Logger/SenfLog.hh" +#include +#include //#include "Telnet.mpp" #define prefix_ diff --git a/senf/Utils/Termlib/Telnet.test.cc b/senf/Utils/Termlib/Telnet.test.cc index 2d14d0c..49ff472 100644 --- a/senf/Utils/Termlib/Telnet.test.cc +++ b/senf/Utils/Termlib/Telnet.test.cc @@ -29,7 +29,7 @@ // Custom includes #include "Telnet.hh" -#include "../../Utils/auto_unit_test.hh" +#include #include #define prefix_ diff --git a/senf/Utils/Termlib/TelnetTerminal.hh b/senf/Utils/Termlib/TelnetTerminal.hh index 09aea80..434acb7 100644 --- a/senf/Utils/Termlib/TelnetTerminal.hh +++ b/senf/Utils/Termlib/TelnetTerminal.hh @@ -29,7 +29,7 @@ // Custom includes #include "Telnet.hh" #include "AbstractTerminal.hh" -#include "../Logger.hh" +#include //#include "TelnetTerminal.mpp" ///////////////////////////////hh.p//////////////////////////////////////// diff --git a/senf/Utils/Termlib/Terminfo.test.cc b/senf/Utils/Termlib/Terminfo.test.cc index f382898..0bd5826 100644 --- a/senf/Utils/Termlib/Terminfo.test.cc +++ b/senf/Utils/Termlib/Terminfo.test.cc @@ -29,7 +29,7 @@ // Custom includes #include "Terminfo.hh" -#include "../../Utils/auto_unit_test.hh" +#include #include #define prefix_ diff --git a/senf/Utils/Termlib/main.test.cc b/senf/Utils/Termlib/main.test.cc index b7b129a..9f91d17 100644 --- a/senf/Utils/Termlib/main.test.cc +++ b/senf/Utils/Termlib/main.test.cc @@ -27,7 +27,7 @@ // Custom includes #define BOOST_AUTO_TEST_MAIN -#include "../../Utils/auto_unit_test.hh" +#include #include #define prefix_ diff --git a/senf/Utils/Termlib/telnetServer.cc b/senf/Utils/Termlib/telnetServer.cc index c9aeb7f..e0a1b57 100644 --- a/senf/Utils/Termlib/telnetServer.cc +++ b/senf/Utils/Termlib/telnetServer.cc @@ -28,10 +28,10 @@ // Custom includes #include -#include "../../Utils/membind.hh" -#include "../../Scheduler/Scheduler.hh" -#include "../Logger.hh" -#include "../../Socket/Protocols/INet.hh" +#include +#include +#include +#include #include "TelnetTerminal.hh" #include "Editor.hh" diff --git a/senf/Utils/TypeIdValue.test.cc b/senf/Utils/TypeIdValue.test.cc index 022041a..4652f53 100644 --- a/senf/Utils/TypeIdValue.test.cc +++ b/senf/Utils/TypeIdValue.test.cc @@ -29,7 +29,7 @@ // Custom includes #include "TypeIdValue.hh" -#include "../Utils/auto_unit_test.hh" +#include #include #define prefix_ diff --git a/senf/Utils/TypeInfo.test.cc b/senf/Utils/TypeInfo.test.cc index f77c530..d89c977 100644 --- a/senf/Utils/TypeInfo.test.cc +++ b/senf/Utils/TypeInfo.test.cc @@ -29,7 +29,7 @@ // Custom includes #include "TypeInfo.hh" -#include "../Utils/auto_unit_test.hh" +#include #include #define prefix_ diff --git a/senf/Utils/hexdump.test.cc b/senf/Utils/hexdump.test.cc index 028c73b..bd77e28 100644 --- a/senf/Utils/hexdump.test.cc +++ b/senf/Utils/hexdump.test.cc @@ -30,7 +30,7 @@ #include "hexdump.hh" #include -#include "../Utils/auto_unit_test.hh" +#include #include #define prefix_ diff --git a/senf/Utils/intrusive_refcount.test.cc b/senf/Utils/intrusive_refcount.test.cc index a947f1d..b86a137 100644 --- a/senf/Utils/intrusive_refcount.test.cc +++ b/senf/Utils/intrusive_refcount.test.cc @@ -30,7 +30,7 @@ #include "intrusive_refcount.hh" #include -#include "../Utils/auto_unit_test.hh" +#include #include #define prefix_ diff --git a/senf/Utils/main.test.cc b/senf/Utils/main.test.cc index d2f37be..9f91d17 100644 --- a/senf/Utils/main.test.cc +++ b/senf/Utils/main.test.cc @@ -27,7 +27,7 @@ // Custom includes #define BOOST_AUTO_TEST_MAIN -#include "../Utils/auto_unit_test.hh" +#include #include #define prefix_ diff --git a/senf/Utils/membind.hh b/senf/Utils/membind.hh index 3b1c4f7..b77c3bd 100644 --- a/senf/Utils/membind.hh +++ b/senf/Utils/membind.hh @@ -53,7 +53,7 @@ // Custom includes #include #include -#include "../config.hh" +#include ///////////////////////////////hh.p//////////////////////////////////////// @@ -149,11 +149,11 @@ namespace senf { #define scOBTYPE * -#include "../Utils/impl/membind.hh" +#include #undef scOBTYPE #define scOBTYPE & -#include "../Utils/impl/membind.hh" +#include #undef scOBTYPE #ifdef DOXYGEN diff --git a/senf/Utils/membind.test.cc b/senf/Utils/membind.test.cc index 14982ce..ad5be94 100644 --- a/senf/Utils/membind.test.cc +++ b/senf/Utils/membind.test.cc @@ -31,7 +31,7 @@ #include #include "membind.hh" -#include "../Utils/auto_unit_test.hh" +#include #include #define prefix_ diff --git a/senf/Utils/mpl.hh b/senf/Utils/mpl.hh index fb1b566..4f504fb 100644 --- a/senf/Utils/mpl.hh +++ b/senf/Utils/mpl.hh @@ -27,7 +27,7 @@ #define HH_SENF_Utils_mpl_ 1 // Custom includes -#include "../config.hh" +#include //#include "mpl.mpp" #include "mpl.ih" diff --git a/senf/Utils/mpl.test.cc b/senf/Utils/mpl.test.cc index 25d6f0c..9591a96 100644 --- a/senf/Utils/mpl.test.cc +++ b/senf/Utils/mpl.test.cc @@ -29,7 +29,7 @@ // Custom includes #include "mpl.hh" -#include "../Utils/auto_unit_test.hh" +#include #include #define prefix_ diff --git a/senf/Utils/parameter.test.cc b/senf/Utils/parameter.test.cc index e09c615..e946c97 100644 --- a/senf/Utils/parameter.test.cc +++ b/senf/Utils/parameter.test.cc @@ -29,7 +29,7 @@ // Custom includes #include "parameter.hh" -#include "../Utils/auto_unit_test.hh" +#include #include #define prefix_ diff --git a/senf/Utils/pool_alloc_mixin.cti b/senf/Utils/pool_alloc_mixin.cti index 93b062f..bb002d0 100644 --- a/senf/Utils/pool_alloc_mixin.cti +++ b/senf/Utils/pool_alloc_mixin.cti @@ -26,7 +26,7 @@ //#include "pool_alloc_mixin.ih" // Custom includes -#include "../Utils/senfassert.hh" +#include #define prefix_ inline ///////////////////////////////cti.p/////////////////////////////////////// diff --git a/senf/Utils/pool_alloc_mixin.test.cc b/senf/Utils/pool_alloc_mixin.test.cc index a5ab332..c042aa1 100644 --- a/senf/Utils/pool_alloc_mixin.test.cc +++ b/senf/Utils/pool_alloc_mixin.test.cc @@ -30,7 +30,7 @@ #include "pool_alloc_mixin.hh" #include -#include "../Utils/auto_unit_test.hh" +#include #include #define prefix_ diff --git a/senf/Utils/preprocessor.test.cc b/senf/Utils/preprocessor.test.cc index f127d82..f9b560c 100644 --- a/senf/Utils/preprocessor.test.cc +++ b/senf/Utils/preprocessor.test.cc @@ -29,7 +29,7 @@ // Custom includes #include "preprocessor.hh" -#include "../Utils/auto_unit_test.hh" +#include #include #define prefix_ diff --git a/senf/Utils/safe_bool.test.cc b/senf/Utils/safe_bool.test.cc index 75dd100..95b7d7f 100644 --- a/senf/Utils/safe_bool.test.cc +++ b/senf/Utils/safe_bool.test.cc @@ -29,7 +29,7 @@ // Custom includes #include "safe_bool.hh" -#include "../Utils/auto_unit_test.hh" +#include #include #define prefix_ diff --git a/senf/Utils/senfassert.hh b/senf/Utils/senfassert.hh index caa515a..6a6c8ca 100644 --- a/senf/Utils/senfassert.hh +++ b/senf/Utils/senfassert.hh @@ -27,7 +27,7 @@ #define HH_SENF_Utils_senfassert_ 1 // Custom includes -#include "../Utils/senfassert.hh" +#include //#include "senfassert.mpp" ///////////////////////////////hh.p//////////////////////////////////////// diff --git a/senf/Utils/singleton.test.cc b/senf/Utils/singleton.test.cc index 348605a..9d5785c 100644 --- a/senf/Utils/singleton.test.cc +++ b/senf/Utils/singleton.test.cc @@ -30,7 +30,7 @@ #include #include "singleton.hh" -#include "../Utils/auto_unit_test.hh" +#include #include #define prefix_ diff --git a/senf/Utils/type_traits.hh b/senf/Utils/type_traits.hh index dd9ddb2..a728ac0 100644 --- a/senf/Utils/type_traits.hh +++ b/senf/Utils/type_traits.hh @@ -33,7 +33,7 @@ #include #include #include -#include "../config.hh" +#include #include "type_traits.mpp" ///////////////////////////////hh.p//////////////////////////////////////// diff --git a/senf/Utils/type_traits.test.cc b/senf/Utils/type_traits.test.cc index fc3d828..c446157 100644 --- a/senf/Utils/type_traits.test.cc +++ b/senf/Utils/type_traits.test.cc @@ -31,7 +31,7 @@ #include #include "type_traits.hh" -#include "../Utils/auto_unit_test.hh" +#include #include #define prefix_ diff --git a/site_scons/Doxyfile.template b/site_scons/Doxyfile.template deleted file mode 100644 index 8e18c3f..0000000 --- a/site_scons/Doxyfile.template +++ /dev/null @@ -1,274 +0,0 @@ -# Doxyfile 1.4.2 - -#--------------------------------------------------------------------------- -# Project related configuration options -#--------------------------------------------------------------------------- -PROJECT_NAME = "" -PROJECT_NUMBER = "Version 0.0.1" -OUTPUT_DIRECTORY = doc -CREATE_SUBDIRS = NO -OUTPUT_LANGUAGE = English -USE_WINDOWS_ENCODING = NO -BRIEF_MEMBER_DESC = YES -REPEAT_BRIEF = NO -ABBREVIATE_BRIEF = "The $name class" \ - "The $name widget" \ - "The $name file" \ - is \ - provides \ - specifies \ - contains \ - represents \ - a \ - an \ - the -ALWAYS_DETAILED_SEC = NO -INLINE_INHERITED_MEMB = NO -FULL_PATH_NAMES = NO -STRIP_FROM_PATH = -STRIP_FROM_INC_PATH = -SHORT_NAMES = NO -JAVADOC_AUTOBRIEF = NO -MULTILINE_CPP_IS_BRIEF = NO -DETAILS_AT_TOP = YES -INHERIT_DOCS = YES -DISTRIBUTE_GROUP_DOC = NO -SEPARATE_MEMBER_PAGES = NO -TAB_SIZE = 8 -ALIASES = -OPTIMIZE_OUTPUT_FOR_C = NO -OPTIMIZE_OUTPUT_JAVA = NO -SUBGROUPING = YES -#--------------------------------------------------------------------------- -# Build related configuration options -#--------------------------------------------------------------------------- -EXTRACT_ALL = YES -EXTRACT_PRIVATE = YES -EXTRACT_STATIC = YES -EXTRACT_LOCAL_CLASSES = YES -EXTRACT_LOCAL_METHODS = NO -HIDE_UNDOC_MEMBERS = NO -HIDE_UNDOC_CLASSES = NO -HIDE_FRIEND_COMPOUNDS = NO -HIDE_IN_BODY_DOCS = NO -INTERNAL_DOCS = YES -CASE_SENSE_NAMES = YES -HIDE_SCOPE_NAMES = NO -SHOW_INCLUDE_FILES = YES -INLINE_INFO = YES -SORT_MEMBER_DOCS = YES -SORT_BRIEF_DOCS = NO -SORT_BY_SCOPE_NAME = YES -GENERATE_TODOLIST = YES -GENERATE_TESTLIST = YES -GENERATE_BUGLIST = YES -GENERATE_DEPRECATEDLIST= YES -ENABLED_SECTIONS = -MAX_INITIALIZER_LINES = 30 -SHOW_USED_FILES = YES -SHOW_DIRECTORIES = YES -FILE_VERSION_FILTER = -#--------------------------------------------------------------------------- -# configuration options related to warning and progress messages -#--------------------------------------------------------------------------- -QUIET = NO -WARNINGS = YES -WARN_IF_UNDOCUMENTED = NO -WARN_IF_DOC_ERROR = YES -WARN_NO_PARAMDOC = NO -WARN_FORMAT = "$file:$line: $text" -WARN_LOGFILE = -#--------------------------------------------------------------------------- -# configuration options related to the input files -#--------------------------------------------------------------------------- -INPUT = . -FILE_PATTERNS = *.c \ - *.cc \ - *.cxx \ - *.cpp \ - *.c++ \ - *.d \ - *.java \ - *.ii \ - *.ixx \ - *.ipp \ - *.i++ \ - *.inl \ - *.h \ - *.hh \ - *.hxx \ - *.hpp \ - *.h++ \ - *.idl \ - *.odl \ - *.cs \ - *.php \ - *.php3 \ - *.inc \ - *.m \ - *.mm \ - *.dox \ - *.C \ - *.CC \ - *.C++ \ - *.II \ - *.I++ \ - *.H \ - *.HH \ - *.H++ \ - *.CS \ - *.PHP \ - *.PHP3 \ - *.M \ - *.MM \ - *.cci \ - *.ct \ - *.cti \ - *.ih \ - *.mpp -RECURSIVE = NO -EXCLUDE = doc -EXCLUDE_SYMLINKS = NO -EXCLUDE_PATTERNS = *.test.cc -EXAMPLE_PATH = -EXAMPLE_PATTERNS = * -EXAMPLE_RECURSIVE = NO -IMAGE_PATH = -INPUT_FILTER = -FILTER_PATTERNS = -FILTER_SOURCE_FILES = NO -#--------------------------------------------------------------------------- -# configuration options related to source browsing -#--------------------------------------------------------------------------- -SOURCE_BROWSER = YES -INLINE_SOURCES = NO -STRIP_CODE_COMMENTS = YES -REFERENCED_BY_RELATION = YES -REFERENCES_RELATION = YES -VERBATIM_HEADERS = YES -#--------------------------------------------------------------------------- -# configuration options related to the alphabetical class index -#--------------------------------------------------------------------------- -ALPHABETICAL_INDEX = YES -COLS_IN_ALPHA_INDEX = 5 -IGNORE_PREFIX = -#--------------------------------------------------------------------------- -# configuration options related to the HTML output -#--------------------------------------------------------------------------- -GENERATE_HTML = YES -HTML_OUTPUT = html -HTML_FILE_EXTENSION = .html -HTML_HEADER = -HTML_FOOTER = -HTML_STYLESHEET = -HTML_ALIGN_MEMBERS = YES -GENERATE_HTMLHELP = NO -CHM_FILE = -HHC_LOCATION = -GENERATE_CHI = NO -BINARY_TOC = NO -TOC_EXPAND = NO -DISABLE_INDEX = NO -ENUM_VALUES_PER_LINE = 4 -GENERATE_TREEVIEW = NO -TREEVIEW_WIDTH = 250 -#--------------------------------------------------------------------------- -# configuration options related to the LaTeX output -#--------------------------------------------------------------------------- -GENERATE_LATEX = NO -LATEX_OUTPUT = latex -LATEX_CMD_NAME = latex -MAKEINDEX_CMD_NAME = makeindex -COMPACT_LATEX = NO -PAPER_TYPE = a4wide -EXTRA_PACKAGES = -LATEX_HEADER = -PDF_HYPERLINKS = NO -USE_PDFLATEX = NO -LATEX_BATCHMODE = NO -LATEX_HIDE_INDICES = NO -#--------------------------------------------------------------------------- -# configuration options related to the RTF output -#--------------------------------------------------------------------------- -GENERATE_RTF = NO -RTF_OUTPUT = rtf -COMPACT_RTF = NO -RTF_HYPERLINKS = NO -RTF_STYLESHEET_FILE = -RTF_EXTENSIONS_FILE = -#--------------------------------------------------------------------------- -# configuration options related to the man page output -#--------------------------------------------------------------------------- -GENERATE_MAN = NO -MAN_OUTPUT = man -MAN_EXTENSION = .3 -MAN_LINKS = NO -#--------------------------------------------------------------------------- -# configuration options related to the XML output -#--------------------------------------------------------------------------- -GENERATE_XML = NO -XML_OUTPUT = xml -XML_SCHEMA = -XML_DTD = -XML_PROGRAMLISTING = YES -#--------------------------------------------------------------------------- -# configuration options for the AutoGen Definitions output -#--------------------------------------------------------------------------- -GENERATE_AUTOGEN_DEF = NO -#--------------------------------------------------------------------------- -# configuration options related to the Perl module output -#--------------------------------------------------------------------------- -GENERATE_PERLMOD = NO -PERLMOD_LATEX = NO -PERLMOD_PRETTY = YES -PERLMOD_MAKEVAR_PREFIX = -#--------------------------------------------------------------------------- -# Configuration options related to the preprocessor -#--------------------------------------------------------------------------- -ENABLE_PREPROCESSING = YES -MACRO_EXPANSION = YES -EXPAND_ONLY_PREDEF = YES -SEARCH_INCLUDES = YES -INCLUDE_PATH = libs -INCLUDE_FILE_PATTERNS = -PREDEFINED = DOXYGEN -EXPAND_AS_DEFINED = DefineCommand -SKIP_FUNCTION_MACROS = YES -#--------------------------------------------------------------------------- -# Configuration::additions related to external references -#--------------------------------------------------------------------------- -TAGFILES = -GENERATE_TAGFILE = -ALLEXTERNALS = NO -EXTERNAL_GROUPS = YES -PERL_PATH = /usr/bin/perl -#--------------------------------------------------------------------------- -# Configuration options related to the dot tool -#--------------------------------------------------------------------------- -CLASS_DIAGRAMS = YES -HIDE_UNDOC_RELATIONS = NO -HAVE_DOT = YES -CLASS_GRAPH = YES -COLLABORATION_GRAPH = YES -GROUP_GRAPHS = YES -UML_LOOK = NO -TEMPLATE_RELATIONS = NO -INCLUDE_GRAPH = YES -INCLUDED_BY_GRAPH = YES -CALL_GRAPH = NO -GRAPHICAL_HIERARCHY = NO -DIRECTORY_GRAPH = NO -DOT_IMAGE_FORMAT = png -DOT_PATH = -DOTFILE_DIRS = -MAX_DOT_GRAPH_WIDTH = 800 -MAX_DOT_GRAPH_HEIGHT = 1200 -MAX_DOT_GRAPH_DEPTH = 1000 -DOT_TRANSPARENT = NO -DOT_MULTI_TARGETS = YES -GENERATE_LEGEND = YES -DOT_CLEANUP = NO -#--------------------------------------------------------------------------- -# Configuration::additions related to the search engine -#--------------------------------------------------------------------------- -SEARCHENGINE = NO diff --git a/site_scons/SConfig.template b/site_scons/SConfig.template deleted file mode 100644 index 1a99c31..0000000 --- a/site_scons/SConfig.template +++ /dev/null @@ -1,9 +0,0 @@ -CXX = "g++-3.4" - -BOOST_INCLUDES = "/usr/local/include/boost-1_33_1" -BOOST_TOOLSET = "gcc" -BOOST_LIBDIR = "/usr/local/lib" - -STLPORT_INCLUDES = "/usr/local/include/stlport" -STLPORT_LIB = "stlport_gcc" -STLPORT_LIBDIR = "/usr/local/lib"