Reapply changes missed during the previous merge (duh ...)

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

diff --git a/Packets/Packet.cc b/Packets/Packet.cc
index aed46e7..02cc5ec 100644 (file)
--- a/Packets/Packet.cc
+++ b/Packets/Packet.cc
@@ -70,4 +70,5 @@ prefix_ senf::Packet senf::Packet::checkLast()
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:

diff --git a/Packets/Packet.cci b/Packets/Packet.cci
index a65c653..02e5772 100644 (file)
--- a/Packets/Packet.cci
+++ b/Packets/Packet.cci
@@ -158,4 +158,5 @@ prefix_ senf::PacketInterpreterBase::ptr senf::Packet::ptr()
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:

diff --git a/Packets/Packet.ct b/Packets/Packet.ct
index e840389..e293a5e 100644 (file)
--- a/Packets/Packet.ct
+++ b/Packets/Packet.ct
@@ -68,4 +68,5 @@ prefix_ OtherPacket senf::Packet::findPrev(NoThrow_t)
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:

diff --git a/Packets/Packet.cti b/Packets/Packet.cti
index c17dc6f..532c3b0 100644 (file)
--- a/Packets/Packet.cti
+++ b/Packets/Packet.cti
@@ -296,4 +296,5 @@ senf::ConcretePacket<PacketType>::ptr()
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:

diff --git a/Packets/Packet.hh b/Packets/Packet.hh
index f4bc724..ae2c66e 100644 (file)
--- a/Packets/Packet.hh
+++ b/Packets/Packet.hh
@@ -236,4 +236,5 @@ namespace senf {
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:

diff --git a/Packets/Packet.test.cc b/Packets/Packet.test.cc
index 7331b99..60b2bd2 100644 (file)
--- a/Packets/Packet.test.cc
+++ b/Packets/Packet.test.cc
@@ -242,4 +242,5 @@ BOOST_AUTO_UNIT_TEST(concretePacket)
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:

diff --git a/Packets/PacketData.cc b/Packets/PacketData.cc
index 9abdf04..8751951 100644 (file)
--- a/Packets/PacketData.cc
+++ b/Packets/PacketData.cc
@@ -52,4 +52,6 @@ prefix_ void senf::PacketData::resize(size_type n, byte v)
 // c-file-style: "senf"
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
+// compile-command: "scons -u test"
+// comment-column: 40
 // End:

diff --git a/Packets/PacketData.cci b/Packets/PacketData.cci
index 6a62bb0..9a687cf 100644 (file)
--- a/Packets/PacketData.cci
+++ b/Packets/PacketData.cci
@@ -224,4 +224,6 @@ prefix_ senf::PacketData::iterator senf::safe_data_iterator::i()
 // c-file-style: "senf"
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
+// compile-command: "scons -u test"
+// comment-column: 40
 // End:

diff --git a/Packets/PacketData.cti b/Packets/PacketData.cti
index 2e10568..ffe2417 100644 (file)
--- a/Packets/PacketData.cti
+++ b/Packets/PacketData.cti
@@ -51,4 +51,6 @@ insert(iterator pos, InputIterator f, InputIterator l,
 // c-file-style: "senf"
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
+// compile-command: "scons -u test"
+// comment-column: 40
 // End:

diff --git a/Packets/PacketData.hh b/Packets/PacketData.hh
index f1de179..e7dae96 100644 (file)
--- a/Packets/PacketData.hh
+++ b/Packets/PacketData.hh
@@ -177,4 +177,6 @@ namespace senf {
 // c-file-style: "senf"
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
+// compile-command: "scons -u test"
+// comment-column: 40
 // End:

diff --git a/Packets/PacketData.test.cc b/Packets/PacketData.test.cc
index 4354b9a..e9e3f3a 100644 (file)
--- a/Packets/PacketData.test.cc
+++ b/Packets/PacketData.test.cc
@@ -137,4 +137,6 @@ BOOST_AUTO_UNIT_TEST(safePacketIterator)
 // c-file-style: "senf"
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
+// compile-command: "scons -u test"
+// comment-column: 40
 // End:

diff --git a/Packets/PacketImpl.cc b/Packets/PacketImpl.cc
index dd78bb7..e4db066 100644 (file)
--- a/Packets/PacketImpl.cc
+++ b/Packets/PacketImpl.cc
@@ -122,4 +122,6 @@ prefix_ void senf::detail::PacketImpl::updateIterators(PacketData * self, iterat
 // c-file-style: "senf"
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
+// compile-command: "scons -u test"
+// comment-column: 40
 // End:

diff --git a/Packets/PacketImpl.cci b/Packets/PacketImpl.cci
index d8dd2cb..f2293a8 100644 (file)
--- a/Packets/PacketImpl.cci
+++ b/Packets/PacketImpl.cci
@@ -195,4 +195,6 @@ prefix_ senf::detail::PacketImpl::Guard::~Guard()
 // c-file-style: "senf"
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
+// compile-command: "scons -u test"
+// comment-column: 40
 // End:

diff --git a/Packets/PacketImpl.cti b/Packets/PacketImpl.cti
index aae7612..2e3fada 100644 (file)
--- a/Packets/PacketImpl.cti
+++ b/Packets/PacketImpl.cti
@@ -56,4 +56,6 @@ prefix_ senf::detail::PacketImpl::PacketImpl(InputIterator first, InputIterator
 // c-file-style: "senf"
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
+// compile-command: "scons -u test"
+// comment-column: 40
 // End:

diff --git a/Packets/PacketImpl.hh b/Packets/PacketImpl.hh
index 7ba7cb0..39ccd47 100644 (file)
--- a/Packets/PacketImpl.hh
+++ b/Packets/PacketImpl.hh
@@ -126,4 +126,6 @@ namespace detail {
 // c-file-style: "senf"
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
+// compile-command: "scons -u test"
+// comment-column: 40
 // End:

diff --git a/Packets/PacketImpl.test.cc b/Packets/PacketImpl.test.cc
index 0c62174..83e5373 100644 (file)
--- a/Packets/PacketImpl.test.cc
+++ b/Packets/PacketImpl.test.cc
@@ -207,4 +207,6 @@ BOOST_AUTO_UNIT_TEST(packetImpl_interpreters)
 // c-file-style: "senf"
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
+// compile-command: "scons -u test"
+// comment-column: 40
 // End:

diff --git a/Packets/PacketInterpreter.cc b/Packets/PacketInterpreter.cc
index 5ab83d8..7cd389a 100644 (file)
--- a/Packets/PacketInterpreter.cc
+++ b/Packets/PacketInterpreter.cc
@@ -101,4 +101,6 @@ prefix_  senf::PacketInterpreterBase::Factory::~Factory()
 // c-file-style: "senf"
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
+// compile-command: "scons -u test"
+// comment-column: 40
 // End:

diff --git a/Packets/PacketInterpreter.cci b/Packets/PacketInterpreter.cci
index 5d6a51e..94e7c29 100644 (file)
--- a/Packets/PacketInterpreter.cci
+++ b/Packets/PacketInterpreter.cci
@@ -182,4 +182,6 @@ prefix_ void senf::PacketInterpreterBase::releaseImpl()
 // c-file-style: "senf"
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
+// compile-command: "scons -u test"
+// comment-column: 40
 // End:

diff --git a/Packets/PacketInterpreter.ct b/Packets/PacketInterpreter.ct
index 3f72638..b2f455b 100644 (file)
--- a/Packets/PacketInterpreter.ct
+++ b/Packets/PacketInterpreter.ct
@@ -361,4 +361,6 @@ const typename senf::PacketInterpreter<PacketType>::FactoryImpl
 // c-file-style: "senf"
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
+// compile-command: "scons -u test"
+// comment-column: 40
 // End:

diff --git a/Packets/PacketInterpreter.cti b/Packets/PacketInterpreter.cti
index a0748b7..19dc086 100644 (file)
--- a/Packets/PacketInterpreter.cti
+++ b/Packets/PacketInterpreter.cti
@@ -225,4 +225,6 @@ senf::PacketInterpreter<PacketType>::parser_p()
 // c-file-style: "senf"
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
+// compile-command: "scons -u test"
+// comment-column: 40
 // End:

diff --git a/Packets/PacketInterpreter.hh b/Packets/PacketInterpreter.hh
index 7e5f522..d49510f 100644 (file)
--- a/Packets/PacketInterpreter.hh
+++ b/Packets/PacketInterpreter.hh
@@ -359,4 +359,6 @@ namespace senf {
 // c-file-style: "senf"
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
+// compile-command: "scons -u test"
+// comment-column: 40
 // End:

diff --git a/Packets/PacketInterpreter.test.cc b/Packets/PacketInterpreter.test.cc
index b71bf33..c26dc07 100644 (file)
--- a/Packets/PacketInterpreter.test.cc
+++ b/Packets/PacketInterpreter.test.cc
@@ -301,4 +301,6 @@ BOOST_AUTO_UNIT_TEST(packetInterpreter_factory)
 // c-file-style: "senf"
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
+// compile-command: "scons -u test"
+// comment-column: 40
 // End:

diff --git a/Packets/PacketParser.cci b/Packets/PacketParser.cci
index d18cf3a..173e54e 100644 (file)
--- a/Packets/PacketParser.cci
+++ b/Packets/PacketParser.cci
@@ -96,4 +96,6 @@ prefix_ senf::PacketParserBase::data_iterator senf::PacketParserBase::end()
 // c-file-style: "senf"
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
+// compile-command: "scons -u test"
+// comment-column: 40
 // End:

diff --git a/Packets/PacketParser.cti b/Packets/PacketParser.cti
index 9b885e5..826f066 100644 (file)
--- a/Packets/PacketParser.cti
+++ b/Packets/PacketParser.cti
@@ -138,4 +138,6 @@ prefix_ bool senf::SafePacketParser<Parser>::boolean_test()
 // c-file-style: "senf"
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
+// compile-command: "scons -u test"
+// comment-column: 40
 // End:

diff --git a/Packets/PacketParser.hh b/Packets/PacketParser.hh
index cd45e47..e5eee77 100644 (file)
--- a/Packets/PacketParser.hh
+++ b/Packets/PacketParser.hh
@@ -425,4 +425,6 @@ namespace senf {
 // c-file-style: "senf"
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
+// compile-command: "scons -u test"
+// comment-column: 40
 // End:

diff --git a/Packets/PacketParser.ih b/Packets/PacketParser.ih
index 0c6131e..9acee0f 100644 (file)
--- a/Packets/PacketParser.ih
+++ b/Packets/PacketParser.ih
@@ -80,4 +80,5 @@ namespace detail {
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:

diff --git a/Packets/PacketParser.test.cc b/Packets/PacketParser.test.cc
index 9f115cb..5db0e60 100644 (file)
--- a/Packets/PacketParser.test.cc
+++ b/Packets/PacketParser.test.cc
@@ -120,4 +120,6 @@ BOOST_AUTO_UNIT_TEST(safePacketParser)
 // c-file-style: "senf"
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
+// compile-command: "scons -u test"
+// comment-column: 40
 // End:

diff --git a/Packets/PacketRegistry.cc b/Packets/PacketRegistry.cc
index 6b4956c..09a6af8 100644 (file)
--- a/Packets/PacketRegistry.cc
+++ b/Packets/PacketRegistry.cc
@@ -44,4 +44,6 @@ prefix_  senf::PkReg_Entry::~PkReg_Entry()
 // c-file-style: "senf"
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
+// compile-command: "scons -u test"
+// comment-column: 40
 // End:

diff --git a/Packets/PacketType.cci b/Packets/PacketType.cci
index 9ef4a5a..4e37767 100644 (file)
--- a/Packets/PacketType.cci
+++ b/Packets/PacketType.cci
@@ -78,4 +78,6 @@ prefix_ void senf::PacketTypeBase::dump(packet p, std::ostream & os)
 // c-file-style: "senf"
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
+// compile-command: "scons -u test"
+// comment-column: 40
 // End:

diff --git a/Packets/PacketType.cti b/Packets/PacketType.cti
index aa610d8..4f01389 100644 (file)
--- a/Packets/PacketType.cti
+++ b/Packets/PacketType.cti
@@ -115,4 +115,6 @@ prefix_ void senf::PacketTypeMixin<Self,void>::init(Packet p)
 // c-file-style: "senf"
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
+// compile-command: "scons -u test"
+// comment-column: 40
 // End:

diff --git a/Packets/PacketType.hh b/Packets/PacketType.hh
index 88ea3bd..8e46eec 100644 (file)
--- a/Packets/PacketType.hh
+++ b/Packets/PacketType.hh
@@ -284,4 +284,6 @@ namespace senf {
 // c-file-style: "senf"
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
+// compile-command: "scons -u test"
+// comment-column: 40
 // End:

diff --git a/Packets/PacketTypes.hh b/Packets/PacketTypes.hh
index 5a89c1a..980c183 100644 (file)
--- a/Packets/PacketTypes.hh
+++ b/Packets/PacketTypes.hh
@@ -84,4 +84,6 @@ namespace test {
 // c-file-style: "senf"
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
+// compile-command: "scons -u test"
+// comment-column: 40
 // End:

diff --git a/Packets/ParseArray.ct b/Packets/ParseArray.ct
index f893f01..411b077 100644 (file)
--- a/Packets/ParseArray.ct
+++ b/Packets/ParseArray.ct
@@ -54,4 +54,5 @@ prefix_ void senf::Parse_Array<elements,ElementParser>::init()
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:

diff --git a/Packets/ParseArray.cti b/Packets/ParseArray.cti
index 8631811..901b51a 100644 (file)
--- a/Packets/ParseArray.cti
+++ b/Packets/ParseArray.cti
@@ -165,4 +165,5 @@ prefix_ void senf::detail::Parse_Array_iterator<ElementParser>::advance(int n)
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:

diff --git a/Packets/ParseArray.hh b/Packets/ParseArray.hh
index 851486a..1e98a71 100644 (file)
--- a/Packets/ParseArray.hh
+++ b/Packets/ParseArray.hh
@@ -75,4 +75,5 @@ namespace senf {
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:

diff --git a/Packets/ParseArray.ih b/Packets/ParseArray.ih
index 7ea3d50..9aa344b 100644 (file)
--- a/Packets/ParseArray.ih
+++ b/Packets/ParseArray.ih
@@ -74,4 +74,5 @@ private:
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:

diff --git a/Packets/ParseArray.test.cc b/Packets/ParseArray.test.cc
index fdef965..8dc19ae 100644 (file)
--- a/Packets/ParseArray.test.cc
+++ b/Packets/ParseArray.test.cc
@@ -107,4 +107,5 @@ BOOST_AUTO_UNIT_TEST(parseArray_test)
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:

diff --git a/Packets/ParseVec.ct b/Packets/ParseVec.ct
index 9aaefbe..de1f131 100644 (file)
--- a/Packets/ParseVec.ct
+++ b/Packets/ParseVec.ct
@@ -118,4 +118,5 @@ prefix_ void senf::Parse_Vector_Container<ElementParser,Sizer>::resize(size_type
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:

diff --git a/Packets/ParseVec.cti b/Packets/ParseVec.cti
index 66c6a93..b50e50b 100644 (file)
--- a/Packets/ParseVec.cti
+++ b/Packets/ParseVec.cti
@@ -391,4 +391,5 @@ prefix_ void senf::Parse_Vector_Container<ElementParser,Sizer>::setSize(size_typ
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:

diff --git a/Packets/ParseVec.hh b/Packets/ParseVec.hh
index 373903e..21239e8 100644 (file)
--- a/Packets/ParseVec.hh
+++ b/Packets/ParseVec.hh
@@ -211,4 +211,5 @@ namespace senf {
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:

diff --git a/Packets/ParseVec.test.cc b/Packets/ParseVec.test.cc
index ffb22ca..35079a7 100644 (file)
--- a/Packets/ParseVec.test.cc
+++ b/Packets/ParseVec.test.cc
@@ -185,4 +185,5 @@ BOOST_AUTO_UNIT_TEST(parseVec_wrapper)
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:

diff --git a/Packets/main.test.hh b/Packets/main.test.hh
index f7d6f79..470fc57 100644 (file)
--- a/Packets/main.test.hh
+++ b/Packets/main.test.hh
@@ -64,4 +64,6 @@ namespace test {
 // c-file-style: "senf"
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
+// compile-command: "scons -u test"
+// comment-column: 40
 // End:

diff --git a/Utils/intrusive_refcount.cti b/Utils/intrusive_refcount.cti
index bf3c744..7b50655 100644 (file)
--- a/Utils/intrusive_refcount.cti
+++ b/Utils/intrusive_refcount.cti
@@ -66,4 +66,6 @@ prefix_ senf::intrusive_refcount_t<Self>::intrusive_refcount_t()
 // c-file-style: "senf"
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
+// compile-command: "scons -u test"
+// comment-column: 40
 // End:

diff --git a/Utils/pool_alloc_mixin.cti b/Utils/pool_alloc_mixin.cti
index 6139961..a163146 100644 (file)
--- a/Utils/pool_alloc_mixin.cti
+++ b/Utils/pool_alloc_mixin.cti
@@ -81,4 +81,6 @@ prefix_ unsigned long senf::pool_alloc_mixin<Self>::allocCounter(long delta)
 // c-file-style: "senf"
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
+// compile-command: "scons -u test"
+// comment-column: 40
 // End:

diff --git a/Utils/pool_alloc_mixin.hh b/Utils/pool_alloc_mixin.hh
index fc1a232..6154873 100644 (file)
--- a/Utils/pool_alloc_mixin.hh
+++ b/Utils/pool_alloc_mixin.hh
@@ -104,4 +104,6 @@ namespace senf {
 // c-file-style: "senf"
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
+// compile-command: "scons -u test"
+// comment-column: 40
 // End:

diff --git a/Utils/singleton.cti b/Utils/singleton.cti
index 02c07dc..1f3b5c0 100644 (file)
--- a/Utils/singleton.cti
+++ b/Utils/singleton.cti
@@ -62,4 +62,6 @@ typename senf::singleton<Self>::force_creation senf::singleton<Self>::create_;
 // c-file-style: "senf"
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
+// compile-command: "scons -u test"
+// comment-column: 40
 // End:

diff --git a/Utils/singleton.hh b/Utils/singleton.hh
index d95b518..ade1fa3 100644 (file)
--- a/Utils/singleton.hh
+++ b/Utils/singleton.hh
@@ -104,4 +104,6 @@ namespace senf {
 // c-file-style: "senf"
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
+// compile-command: "scons -u test"
+// comment-column: 40
 // End:

diff --git a/find-sources.sh b/find-sources.sh
index df2080b..b28c390 100755 (executable)
--- a/find-sources.sh
+++ b/find-sources.sh
@@ -1,4 +1,21 @@
-#!/bin/sh
+#!/bin/sh -e
+
+if [ -z "$1" ]; then
+    echo "Usage:"
+    echo "     $0 [-c] <commands>"
+    echo
+    echo "-c Only list C/C++ source files"
+    echo
+    echo "<commands> are any find commands (which should contain a -print somewhere)"
+    echo "which are matched for any file fond"
+    exit 1
+fi
+
+cond=""
+if [ "$1" = "-c" ]; then
+    shift
+    cond='( -name *.h -o -name *.hh -o -name *.ih -o -name *.c -o -name *.cc -o -name *.cci -o -name *.ct -o -name *.cti )'
+fi
 
 find . \
        -name .svn -prune -o \
@@ -11,5 +28,5 @@ find . \
        -name .test.bin -o \
        -name "*.stamp" -o \
        -name ".sconsign*" -o \
-       -type f \( "$@" \)
+    -type f $cond \( "$@" \)