From eb1d48e3852297ea4a87c1910f86db8c2131248c Mon Sep 17 00:00:00 2001
From: g0dil <g0dil@wiback.org>
Date: Tue, 10 Jul 2007 20:39:34 +0000
Subject: [PATCH] Add new file-variable 'comment-column'

---
 Examples/MCSniffer/MCSniffer.cc              | 1 +
 Examples/Sniffer/Sniffer.cc                  | 1 +
 PPI/Connectors.hh                            | 1 +
 PPI/Events.hh                                | 1 +
 PPI/Module.hh                                | 1 +
 PPI/PassiveQueue.hh                          | 1 +
 PPI/Queueing.hh                              | 1 +
 PPI/Route.hh                                 | 1 +
 PPI/SocketReader.hh                          | 1 +
 PPI/SocketWriter.hh                          | 1 +
 Packets/DataPacket.cc                        | 1 +
 Packets/DataPacket.cti                       | 1 +
 Packets/DataPacket.hh                        | 1 +
 Packets/DefaultBundle/EthernetPacket.cc      | 1 +
 Packets/DefaultBundle/EthernetPacket.cti     | 1 +
 Packets/DefaultBundle/EthernetPacket.hh      | 1 +
 Packets/DefaultBundle/EthernetPacket.test.cc | 1 +
 Packets/DefaultBundle/IpV4Packet.cc          | 1 +
 Packets/DefaultBundle/IpV4Packet.cti         | 1 +
 Packets/DefaultBundle/IpV4Packet.hh          | 1 +
 Packets/DefaultBundle/IpV4Packet.test.cc     | 1 +
 Packets/DefaultBundle/IpV6Extensions.cc      | 1 +
 Packets/DefaultBundle/IpV6Extensions.ct      | 1 +
 Packets/DefaultBundle/IpV6Extensions.hh      | 1 +
 Packets/DefaultBundle/IpV6Extensions.test.cc | 1 +
 Packets/DefaultBundle/IpV6Packet.cc          | 1 +
 Packets/DefaultBundle/IpV6Packet.cti         | 1 +
 Packets/DefaultBundle/IpV6Packet.hh          | 1 +
 Packets/DefaultBundle/IpV6Packet.test.cc     | 1 +
 Packets/DefaultBundle/UDPPacket.cc           | 1 +
 Packets/DefaultBundle/UDPPacket.cti          | 1 +
 Packets/DefaultBundle/UDPPacket.hh           | 1 +
 Packets/DefaultBundle/UDPPacket.test.cc      | 1 +
 Packets/DefaultBundle/main.test.cc           | 1 +
 Packets/GenericPacket.ct                     | 1 +
 Packets/GenericPacket.cti                    | 1 +
 Packets/GenericPacket.hh                     | 1 +
 Packets/Packet.cc                            | 1 +
 Packets/Packet.cci                           | 1 +
 Packets/Packet.ct                            | 1 +
 Packets/Packet.cti                           | 1 +
 Packets/Packet.hh                            | 1 +
 Packets/Packet.ih                            | 1 +
 Packets/Packet.test.cc                       | 1 +
 Packets/PacketRegistry.cc                    | 1 +
 Packets/PacketRegistry.ct                    | 1 +
 Packets/PacketRegistry.cti                   | 1 +
 Packets/PacketRegistry.hh                    | 1 +
 Packets/PacketRegistry.ih                    | 1 +
 Packets/PacketRegistry.test.cc               | 1 +
 Packets/ParseArray.cti                       | 1 +
 Packets/ParseArray.hh                        | 1 +
 Packets/ParseArray.ih                        | 1 +
 Packets/ParseArray.test.cc                   | 1 +
 Packets/ParseInt.hh                          | 1 +
 Packets/ParseInt.ih                          | 1 +
 Packets/ParseInt.test.cc                     | 1 +
 Packets/ParseListS.ct                        | 1 +
 Packets/ParseListS.cti                       | 1 +
 Packets/ParseListS.hh                        | 1 +
 Packets/ParseListS.ih                        | 1 +
 Packets/ParseListS.test.cc                   | 1 +
 Packets/ParseVec.ct                          | 1 +
 Packets/ParseVec.cti                         | 1 +
 Packets/ParseVec.hh                          | 1 +
 Packets/ParseVec.test.cc                     | 1 +
 Packets/ParserBase.cti                       | 1 +
 Packets/ParserBase.hh                        | 1 +
 Packets/ParserBase.ih                        | 1 +
 Packets/ParserBase.test.cc                   | 1 +
 Packets/RTPBundle/RTCPPacket.cc              | 1 +
 Packets/RTPBundle/RTCPPacket.cti             | 1 +
 Packets/RTPBundle/RTCPPacket.hh              | 1 +
 Packets/RTPBundle/RTCPPacket.test.cc         | 1 +
 Packets/RTPBundle/RTPPacket.cc               | 1 +
 Packets/RTPBundle/RTPPacket.cti              | 1 +
 Packets/RTPBundle/RTPPacket.hh               | 1 +
 Packets/RTPBundle/RTPPacket.test.cc          | 1 +
 Packets/RTPBundle/main.test.cc               | 1 +
 Packets/docstub.hh                           | 1 +
 Packets/main.test.cc                         | 1 +
 Packets/typeidvalue.cci                      | 1 +
 Packets/typeidvalue.cti                      | 1 +
 Packets/typeidvalue.hh                       | 1 +
 Scheduler/ReadHelper.cci                     | 1 +
 Scheduler/ReadHelper.ct                      | 1 +
 Scheduler/ReadHelper.cti                     | 1 +
 Scheduler/ReadHelper.hh                      | 1 +
 Scheduler/ReadHelper.ih                      | 1 +
 Scheduler/ReadHelper.test.cc                 | 1 +
 Scheduler/Scheduler.cc                       | 1 +
 Scheduler/Scheduler.cci                      | 1 +
 Scheduler/Scheduler.cti                      | 1 +
 Scheduler/Scheduler.hh                       | 1 +
 Scheduler/Scheduler.test.cc                  | 1 +
 Scheduler/WriteHelper.ct                     | 1 +
 Scheduler/WriteHelper.cti                    | 1 +
 Scheduler/WriteHelper.hh                     | 1 +
 Scheduler/WriteHelper.test.cc                | 1 +
 Scheduler/main.test.cc                       | 1 +
 Socket/AddressingPolicy.hh                   | 1 +
 Socket/BSDSocketProtocol.cc                  | 1 +
 Socket/BSDSocketProtocol.hh                  | 1 +
 Socket/BufferingPolicy.cc                    | 1 +
 Socket/BufferingPolicy.hh                    | 1 +
 Socket/ClientSocketHandle.ct                 | 1 +
 Socket/ClientSocketHandle.cti                | 1 +
 Socket/ClientSocketHandle.hh                 | 1 +
 Socket/ClientSocketHandle.ih                 | 1 +
 Socket/ClientSocketHandle.test.cc            | 1 +
 Socket/CommunicationPolicy.cc                | 1 +
 Socket/CommunicationPolicy.cti               | 1 +
 Socket/CommunicationPolicy.hh                | 1 +
 Socket/FileHandle.cc                         | 1 +
 Socket/FileHandle.cci                        | 1 +
 Socket/FileHandle.hh                         | 1 +
 Socket/FileHandle.ih                         | 1 +
 Socket/FileHandle.test.cc                    | 1 +
 Socket/FramingPolicy.hh                      | 1 +
 Socket/GenericAddressingPolicy.cc            | 1 +
 Socket/GenericAddressingPolicy.cti           | 1 +
 Socket/GenericAddressingPolicy.hh            | 1 +
 Socket/GenericSockAddr.cci                   | 1 +
 Socket/GenericSockAddr.hh                    | 1 +
 Socket/INetAddressing.cc                     | 1 +
 Socket/INetAddressing.cci                    | 1 +
 Socket/INetAddressing.ct                     | 1 +
 Socket/INetAddressing.hh                     | 1 +
 Socket/INetAddressing.test.cc                | 1 +
 Socket/INetProtocol.cc                       | 1 +
 Socket/INetProtocol.hh                       | 1 +
 Socket/LLAddressing.cc                       | 1 +
 Socket/LLAddressing.cci                      | 1 +
 Socket/LLAddressing.ct                       | 1 +
 Socket/LLAddressing.cti                      | 1 +
 Socket/LLAddressing.hh                       | 1 +
 Socket/LLAddressing.ih                       | 1 +
 Socket/LLAddressing.test.cc                  | 1 +
 Socket/PacketSocketHandle.cc                 | 1 +
 Socket/PacketSocketHandle.ct                 | 1 +
 Socket/PacketSocketHandle.cti                | 1 +
 Socket/PacketSocketHandle.hh                 | 1 +
 Socket/PacketSocketHandle.ih                 | 1 +
 Socket/PacketSocketHandle.test.cc            | 1 +
 Socket/ProtocolClientSocketHandle.cti        | 1 +
 Socket/ProtocolClientSocketHandle.hh         | 1 +
 Socket/ProtocolClientSocketHandle.test.cc    | 1 +
 Socket/ProtocolServerSocketHandle.cti        | 1 +
 Socket/ProtocolServerSocketHandle.hh         | 1 +
 Socket/ProtocolServerSocketHandle.test.cc    | 1 +
 Socket/ReadWritePolicy.cc                    | 1 +
 Socket/ReadWritePolicy.cti                   | 1 +
 Socket/ReadWritePolicy.hh                    | 1 +
 Socket/ServerSocketHandle.cti                | 1 +
 Socket/ServerSocketHandle.hh                 | 1 +
 Socket/ServerSocketHandle.test.cc            | 1 +
 Socket/SocketHandle.cc                       | 1 +
 Socket/SocketHandle.cci                      | 1 +
 Socket/SocketHandle.ct                       | 1 +
 Socket/SocketHandle.cti                      | 1 +
 Socket/SocketHandle.hh                       | 1 +
 Socket/SocketHandle.ih                       | 1 +
 Socket/SocketHandle.test.cc                  | 1 +
 Socket/SocketPolicy.ct                       | 1 +
 Socket/SocketPolicy.hh                       | 1 +
 Socket/SocketPolicy.ih                       | 1 +
 Socket/SocketPolicy.test.cc                  | 1 +
 Socket/SocketPolicy.test.hh                  | 1 +
 Socket/SocketProtocol.cc                     | 1 +
 Socket/SocketProtocol.cci                    | 1 +
 Socket/SocketProtocol.cti                    | 1 +
 Socket/SocketProtocol.hh                     | 1 +
 Socket/SocketProtocol.test.cc                | 1 +
 Socket/SocketProtocol.test.hh                | 1 +
 Socket/TCPProtocol.cc                        | 1 +
 Socket/TCPProtocol.hh                        | 1 +
 Socket/TCPSocketHandle.cc                    | 1 +
 Socket/TCPSocketHandle.hh                    | 1 +
 Socket/TCPSocketHandle.test.cc               | 1 +
 Socket/UDPProtocol.cc                        | 1 +
 Socket/UDPProtocol.hh                        | 1 +
 Socket/UDPSocketHandle.cc                    | 1 +
 Socket/UDPSocketHandle.hh                    | 1 +
 Socket/UDPSocketHandle.test.cc               | 1 +
 Socket/main.test.cc                          | 1 +
 Utils/Buffer.hh                              | 1 +
 Utils/DaemonTools.cc                         | 1 +
 Utils/DaemonTools.hh                         | 1 +
 Utils/Exception.cc                           | 1 +
 Utils/Exception.cci                          | 1 +
 Utils/Exception.hh                           | 1 +
 Utils/IteratorTraits.cti                     | 1 +
 Utils/IteratorTraits.hh                      | 1 +
 Utils/IteratorTraits.ih                      | 1 +
 Utils/IteratorTraits.test.cc                 | 1 +
 Utils/Logger.hh                              | 1 +
 Utils/Logger.test.cc                         | 1 +
 Utils/MicroTime.cc                           | 1 +
 Utils/MicroTime.hh                           | 1 +
 Utils/MicroTime.test.cc                      | 1 +
 Utils/SafeBool.cci                           | 1 +
 Utils/SafeBool.cti                           | 1 +
 Utils/SafeBool.hh                            | 1 +
 Utils/TypeInfo.cc                            | 1 +
 Utils/TypeInfo.hh                            | 1 +
 Utils/TypeInfo.test.cc                       | 1 +
 Utils/impl/membind.hh                        | 1 +
 Utils/intrusive_refcount.cci                 | 1 +
 Utils/intrusive_refcount.hh                  | 1 +
 Utils/intrusive_refcount.test.cc             | 1 +
 Utils/main.test.cc                           | 1 +
 Utils/membind.hh                             | 1 +
 Utils/membind.test.cc                        | 1 +
 project.el                                   | 3 ++-
 214 files changed, 215 insertions(+), 1 deletion(-)

diff --git a/Examples/MCSniffer/MCSniffer.cc b/Examples/MCSniffer/MCSniffer.cc
index 366b40a13..7e900c23f 100644
--- a/Examples/MCSniffer/MCSniffer.cc
+++ b/Examples/MCSniffer/MCSniffer.cc
@@ -144,4 +144,5 @@ int main(int argc, char const * argv[])
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Examples/Sniffer/Sniffer.cc b/Examples/Sniffer/Sniffer.cc
index 34ce055c4..2ab4bd687 100644
--- a/Examples/Sniffer/Sniffer.cc
+++ b/Examples/Sniffer/Sniffer.cc
@@ -171,4 +171,5 @@ int main(int argc, char const * argv[])
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/PPI/Connectors.hh b/PPI/Connectors.hh
index 99e50ce7b..c915c062a 100644
--- a/PPI/Connectors.hh
+++ b/PPI/Connectors.hh
@@ -329,4 +329,5 @@ namespace connector {
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/PPI/Events.hh b/PPI/Events.hh
index ed35f1f32..154beba62 100644
--- a/PPI/Events.hh
+++ b/PPI/Events.hh
@@ -79,4 +79,5 @@ namespace ppi {
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/PPI/Module.hh b/PPI/Module.hh
index 6f998c041..30d52d989 100644
--- a/PPI/Module.hh
+++ b/PPI/Module.hh
@@ -144,4 +144,5 @@ namespace module {
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/PPI/PassiveQueue.hh b/PPI/PassiveQueue.hh
index 5bc0d2ab7..0d07b5016 100644
--- a/PPI/PassiveQueue.hh
+++ b/PPI/PassiveQueue.hh
@@ -74,4 +74,5 @@ namespace module {
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/PPI/Queueing.hh b/PPI/Queueing.hh
index 7ac162e99..9e3acf8f0 100644
--- a/PPI/Queueing.hh
+++ b/PPI/Queueing.hh
@@ -74,4 +74,5 @@ namespace ppi {
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/PPI/Route.hh b/PPI/Route.hh
index 1982d87f8..79e478dfd 100644
--- a/PPI/Route.hh
+++ b/PPI/Route.hh
@@ -79,4 +79,5 @@ namespace ppi {
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/PPI/SocketReader.hh b/PPI/SocketReader.hh
index 2b1245b01..4d0c62607 100644
--- a/PPI/SocketReader.hh
+++ b/PPI/SocketReader.hh
@@ -113,4 +113,5 @@ namespace module {
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/PPI/SocketWriter.hh b/PPI/SocketWriter.hh
index b954e9a59..7e134380f 100644
--- a/PPI/SocketWriter.hh
+++ b/PPI/SocketWriter.hh
@@ -140,4 +140,5 @@ namespace module {
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Packets/DataPacket.cc b/Packets/DataPacket.cc
index 5cf0c82a6..7a29da094 100644
--- a/Packets/DataPacket.cc
+++ b/Packets/DataPacket.cc
@@ -55,4 +55,5 @@ prefix_ void senf::DataPacket::v_dump(std::ostream & os)
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Packets/DataPacket.cti b/Packets/DataPacket.cti
index 06853c45c..593bccdc8 100644
--- a/Packets/DataPacket.cti
+++ b/Packets/DataPacket.cti
@@ -45,4 +45,5 @@ prefix_ senf::DataPacket::DataPacket(Arg const & arg)
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Packets/DataPacket.hh b/Packets/DataPacket.hh
index 1e2fc8a65..fe1bc6861 100644
--- a/Packets/DataPacket.hh
+++ b/Packets/DataPacket.hh
@@ -80,4 +80,5 @@ namespace senf {
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Packets/DefaultBundle/EthernetPacket.cc b/Packets/DefaultBundle/EthernetPacket.cc
index 996f9297a..aef7dca1c 100644
--- a/Packets/DefaultBundle/EthernetPacket.cc
+++ b/Packets/DefaultBundle/EthernetPacket.cc
@@ -113,4 +113,5 @@ prefix_ void senf::EthVLanPacket::v_dump(std::ostream & os)
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Packets/DefaultBundle/EthernetPacket.cti b/Packets/DefaultBundle/EthernetPacket.cti
index 8bdd9387b..3289e4986 100644
--- a/Packets/DefaultBundle/EthernetPacket.cti
+++ b/Packets/DefaultBundle/EthernetPacket.cti
@@ -50,4 +50,5 @@ prefix_ senf::EthVLanPacket::EthVLanPacket(Arg const & arg)
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Packets/DefaultBundle/EthernetPacket.hh b/Packets/DefaultBundle/EthernetPacket.hh
index 2fb814c16..e8487fc6d 100644
--- a/Packets/DefaultBundle/EthernetPacket.hh
+++ b/Packets/DefaultBundle/EthernetPacket.hh
@@ -154,4 +154,5 @@ namespace senf {
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Packets/DefaultBundle/EthernetPacket.test.cc b/Packets/DefaultBundle/EthernetPacket.test.cc
index eb95b5a9e..403471ac1 100644
--- a/Packets/DefaultBundle/EthernetPacket.test.cc
+++ b/Packets/DefaultBundle/EthernetPacket.test.cc
@@ -96,4 +96,5 @@ BOOST_AUTO_UNIT_TEST(ethernetPacket_chain)
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Packets/DefaultBundle/IpV4Packet.cc b/Packets/DefaultBundle/IpV4Packet.cc
index eaa3a51a2..569bcba51 100644
--- a/Packets/DefaultBundle/IpV4Packet.cc
+++ b/Packets/DefaultBundle/IpV4Packet.cc
@@ -87,4 +87,5 @@ prefix_ void senf::IpV4Packet::v_dump(std::ostream & os)
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Packets/DefaultBundle/IpV4Packet.cti b/Packets/DefaultBundle/IpV4Packet.cti
index 491332cb8..a1661b49c 100644
--- a/Packets/DefaultBundle/IpV4Packet.cti
+++ b/Packets/DefaultBundle/IpV4Packet.cti
@@ -45,4 +45,5 @@ prefix_ senf::IpV4Packet::IpV4Packet(Arg const & arg)
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Packets/DefaultBundle/IpV4Packet.hh b/Packets/DefaultBundle/IpV4Packet.hh
index c85664445..06932a025 100644
--- a/Packets/DefaultBundle/IpV4Packet.hh
+++ b/Packets/DefaultBundle/IpV4Packet.hh
@@ -122,4 +122,5 @@ namespace senf {
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Packets/DefaultBundle/IpV4Packet.test.cc b/Packets/DefaultBundle/IpV4Packet.test.cc
index fb1f6286d..4f02fb928 100644
--- a/Packets/DefaultBundle/IpV4Packet.test.cc
+++ b/Packets/DefaultBundle/IpV4Packet.test.cc
@@ -111,4 +111,5 @@ BOOST_AUTO_UNIT_TEST(ipV4Packet_packet)
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Packets/DefaultBundle/IpV6Extensions.cc b/Packets/DefaultBundle/IpV6Extensions.cc
index 5d823dca3..df38466a1 100644
--- a/Packets/DefaultBundle/IpV6Extensions.cc
+++ b/Packets/DefaultBundle/IpV6Extensions.cc
@@ -66,4 +66,5 @@ prefix_ void senf::IpV6Extension_Fragment::v_dump(std::ostream & os)
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Packets/DefaultBundle/IpV6Extensions.ct b/Packets/DefaultBundle/IpV6Extensions.ct
index 4ff700e22..67520a79b 100644
--- a/Packets/DefaultBundle/IpV6Extensions.ct
+++ b/Packets/DefaultBundle/IpV6Extensions.ct
@@ -44,4 +44,5 @@ prefix_ senf::IpV6Extension_Fragment::IpV6Extension_Fragment(Arg const & arg)
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Packets/DefaultBundle/IpV6Extensions.hh b/Packets/DefaultBundle/IpV6Extensions.hh
index 7bf1a566c..380a2bb3a 100644
--- a/Packets/DefaultBundle/IpV6Extensions.hh
+++ b/Packets/DefaultBundle/IpV6Extensions.hh
@@ -102,4 +102,5 @@ namespace senf {
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Packets/DefaultBundle/IpV6Extensions.test.cc b/Packets/DefaultBundle/IpV6Extensions.test.cc
index 86bd27ae1..02143519d 100644
--- a/Packets/DefaultBundle/IpV6Extensions.test.cc
+++ b/Packets/DefaultBundle/IpV6Extensions.test.cc
@@ -119,4 +119,5 @@ BOOST_AUTO_UNIT_TEST(ipv6Extension_Fragment_packet)
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Packets/DefaultBundle/IpV6Packet.cc b/Packets/DefaultBundle/IpV6Packet.cc
index 318b84e46..b8c1fb515 100644
--- a/Packets/DefaultBundle/IpV6Packet.cc
+++ b/Packets/DefaultBundle/IpV6Packet.cc
@@ -78,4 +78,5 @@ prefix_ void senf::IpV6Packet::v_dump(std::ostream & os)
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Packets/DefaultBundle/IpV6Packet.cti b/Packets/DefaultBundle/IpV6Packet.cti
index a95ef4d06..ef7a29f74 100644
--- a/Packets/DefaultBundle/IpV6Packet.cti
+++ b/Packets/DefaultBundle/IpV6Packet.cti
@@ -44,4 +44,5 @@ prefix_ senf::IpV6Packet::IpV6Packet(Arg const & arg)
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Packets/DefaultBundle/IpV6Packet.hh b/Packets/DefaultBundle/IpV6Packet.hh
index d7809a365..26ab7933d 100644
--- a/Packets/DefaultBundle/IpV6Packet.hh
+++ b/Packets/DefaultBundle/IpV6Packet.hh
@@ -110,4 +110,5 @@ namespace senf {
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Packets/DefaultBundle/IpV6Packet.test.cc b/Packets/DefaultBundle/IpV6Packet.test.cc
index ae64a744e..9385937bb 100644
--- a/Packets/DefaultBundle/IpV6Packet.test.cc
+++ b/Packets/DefaultBundle/IpV6Packet.test.cc
@@ -99,4 +99,5 @@ BOOST_AUTO_UNIT_TEST(ipV6Packet_packet)
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Packets/DefaultBundle/UDPPacket.cc b/Packets/DefaultBundle/UDPPacket.cc
index 31f49517b..ce7da558c 100644
--- a/Packets/DefaultBundle/UDPPacket.cc
+++ b/Packets/DefaultBundle/UDPPacket.cc
@@ -67,4 +67,5 @@ prefix_ void senf::UDPPacket::v_dump(std::ostream & os)
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Packets/DefaultBundle/UDPPacket.cti b/Packets/DefaultBundle/UDPPacket.cti
index db0ef73f6..60f572a02 100644
--- a/Packets/DefaultBundle/UDPPacket.cti
+++ b/Packets/DefaultBundle/UDPPacket.cti
@@ -47,4 +47,5 @@ prefix_ senf::UDPPacket::UDPPacket(Arg const & arg)
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Packets/DefaultBundle/UDPPacket.hh b/Packets/DefaultBundle/UDPPacket.hh
index 58b945587..2935f409f 100644
--- a/Packets/DefaultBundle/UDPPacket.hh
+++ b/Packets/DefaultBundle/UDPPacket.hh
@@ -97,4 +97,5 @@ namespace senf {
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Packets/DefaultBundle/UDPPacket.test.cc b/Packets/DefaultBundle/UDPPacket.test.cc
index a7364b7b8..5e236d5ee 100644
--- a/Packets/DefaultBundle/UDPPacket.test.cc
+++ b/Packets/DefaultBundle/UDPPacket.test.cc
@@ -82,4 +82,5 @@ BOOST_AUTO_UNIT_TEST(udpPacket_packet)
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Packets/DefaultBundle/main.test.cc b/Packets/DefaultBundle/main.test.cc
index a7b3fb509..7607fdcbc 100644
--- a/Packets/DefaultBundle/main.test.cc
+++ b/Packets/DefaultBundle/main.test.cc
@@ -45,4 +45,5 @@
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Packets/GenericPacket.ct b/Packets/GenericPacket.ct
index 7f91b4b7f..59cede2c4 100644
--- a/Packets/GenericPacket.ct
+++ b/Packets/GenericPacket.ct
@@ -58,4 +58,5 @@ prefix_ void senf::GenericPacket<HEADER,TRAILER>::v_dump(std::ostream & os)
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Packets/GenericPacket.cti b/Packets/GenericPacket.cti
index 495e2ec0d..551ab8d59 100644
--- a/Packets/GenericPacket.cti
+++ b/Packets/GenericPacket.cti
@@ -99,4 +99,5 @@ senf::GenericPacket<HEADER,TRAILER>::trailer_len()
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Packets/GenericPacket.hh b/Packets/GenericPacket.hh
index 939cd3a13..cb8d39c31 100644
--- a/Packets/GenericPacket.hh
+++ b/Packets/GenericPacket.hh
@@ -92,4 +92,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.cc b/Packets/Packet.cc
index cbb824a60..0ca332195 100644
--- a/Packets/Packet.cc
+++ b/Packets/Packet.cc
@@ -296,4 +296,5 @@ prefix_ void senf::Packet::dump(std::ostream & os)
 // 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 8033bd3bf..13339b8ba 100644
--- a/Packets/Packet.cci
+++ b/Packets/Packet.cci
@@ -195,4 +195,5 @@ prefix_ bool senf::Packet::unlink()
 // 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 734c4afd0..44a53c6f3 100644
--- a/Packets/Packet.ct
+++ b/Packets/Packet.ct
@@ -153,4 +153,5 @@ prefix_ void senf::Packet::insert(iterator pos, InputIterator f, InputIterator l
 // 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 2f655a7f0..7f222690d 100644
--- a/Packets/Packet.cti
+++ b/Packets/Packet.cti
@@ -71,4 +71,5 @@ prefix_ senf::impl::PacketImpl::PacketImpl(InputIterator begin, InputIterator en
 // 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 f39604261..6cffcaef8 100644
--- a/Packets/Packet.hh
+++ b/Packets/Packet.hh
@@ -627,4 +627,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.ih b/Packets/Packet.ih
index 741b280c9..dcdaab4e9 100644
--- a/Packets/Packet.ih
+++ b/Packets/Packet.ih
@@ -144,4 +144,5 @@ struct senf::Packet::PacketOp_set
 // 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 a77730964..bc565de79 100644
--- a/Packets/Packet.test.cc
+++ b/Packets/Packet.test.cc
@@ -248,4 +248,5 @@ BOOST_AUTO_UNIT_TEST(Packet_new)
 // 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 a544c8216..e563a8155 100644
--- a/Packets/PacketRegistry.cc
+++ b/Packets/PacketRegistry.cc
@@ -44,4 +44,5 @@ senf::impl::PkReg_EntryImpl<senf::DataPacket>
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Packets/PacketRegistry.ct b/Packets/PacketRegistry.ct
index 7d0b690e9..f3dd1a1c9 100644
--- a/Packets/PacketRegistry.ct
+++ b/Packets/PacketRegistry.ct
@@ -108,4 +108,5 @@ senf::PacketRegistry<Tag>::registry()
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Packets/PacketRegistry.cti b/Packets/PacketRegistry.cti
index 988ba36ee..72e503a85 100644
--- a/Packets/PacketRegistry.cti
+++ b/Packets/PacketRegistry.cti
@@ -84,4 +84,5 @@ senf::PacketRegistryMixin<Tag,Derived>::registerInterpreter(typename Tag::key_t
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Packets/PacketRegistry.hh b/Packets/PacketRegistry.hh
index 9bdfa75ab..9174395b4 100644
--- a/Packets/PacketRegistry.hh
+++ b/Packets/PacketRegistry.hh
@@ -206,4 +206,5 @@ namespace senf {
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Packets/PacketRegistry.ih b/Packets/PacketRegistry.ih
index 38cdb9773..75159df97 100644
--- a/Packets/PacketRegistry.ih
+++ b/Packets/PacketRegistry.ih
@@ -110,4 +110,5 @@ namespace impl {
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Packets/PacketRegistry.test.cc b/Packets/PacketRegistry.test.cc
index ed584fc66..aebe11a24 100644
--- a/Packets/PacketRegistry.test.cc
+++ b/Packets/PacketRegistry.test.cc
@@ -172,4 +172,5 @@ BOOST_AUTO_UNIT_TEST(packetRegistry_test)
 // 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 52632ebfb..5fc715906 100644
--- a/Packets/ParseArray.cti
+++ b/Packets/ParseArray.cti
@@ -207,4 +207,5 @@ senf::impl::Parse_Array_iterator<Parser,Iterator>::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 a88d984ba..ee39b49ce 100644
--- a/Packets/ParseArray.hh
+++ b/Packets/ParseArray.hh
@@ -92,4 +92,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 167838562..5ac5d033e 100644
--- a/Packets/ParseArray.ih
+++ b/Packets/ParseArray.ih
@@ -70,4 +70,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 8d1e903f8..b2afcdbdc 100644
--- a/Packets/ParseArray.test.cc
+++ b/Packets/ParseArray.test.cc
@@ -68,4 +68,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/ParseInt.hh b/Packets/ParseInt.hh
index fb201147a..6f219e3b1 100644
--- a/Packets/ParseInt.hh
+++ b/Packets/ParseInt.hh
@@ -355,4 +355,5 @@ namespace senf {
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Packets/ParseInt.ih b/Packets/ParseInt.ih
index b6aec456e..ff44c58d7 100644
--- a/Packets/ParseInt.ih
+++ b/Packets/ParseInt.ih
@@ -225,4 +225,5 @@ namespace impl {
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Packets/ParseInt.test.cc b/Packets/ParseInt.test.cc
index 82daef1ab..be69c8668 100644
--- a/Packets/ParseInt.test.cc
+++ b/Packets/ParseInt.test.cc
@@ -242,4 +242,5 @@ BOOST_AUTO_UNIT_TEST(parseInt_inherited)
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Packets/ParseListS.ct b/Packets/ParseListS.ct
index 1f1dabbcc..a96196f84 100644
--- a/Packets/ParseListS.ct
+++ b/Packets/ParseListS.ct
@@ -122,4 +122,5 @@ senf::Parse_ListS_wrapper<Parser,Sentinel,Container>::insert(iterator pos,
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Packets/ParseListS.cti b/Packets/ParseListS.cti
index 8c77102f7..49e767c19 100644
--- a/Packets/ParseListS.cti
+++ b/Packets/ParseListS.cti
@@ -202,4 +202,5 @@ senf::Parse_ListS_wrapper<Parser,Sentinel,Container>::range()
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Packets/ParseListS.hh b/Packets/ParseListS.hh
index ecbb4d14a..7a777d80b 100644
--- a/Packets/ParseListS.hh
+++ b/Packets/ParseListS.hh
@@ -196,4 +196,5 @@ namespace senf {
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Packets/ParseListS.ih b/Packets/ParseListS.ih
index dad395ca5..114259b11 100644
--- a/Packets/ParseListS.ih
+++ b/Packets/ParseListS.ih
@@ -70,4 +70,5 @@ namespace impl {
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Packets/ParseListS.test.cc b/Packets/ParseListS.test.cc
index a317d7d9b..b7d1907c1 100644
--- a/Packets/ParseListS.test.cc
+++ b/Packets/ParseListS.test.cc
@@ -175,4 +175,5 @@ BOOST_AUTO_UNIT_TEST(parse_ListS_wrapper)
 // 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 7834140ae..9aabd74ac 100644
--- a/Packets/ParseVec.ct
+++ b/Packets/ParseVec.ct
@@ -83,4 +83,5 @@ senf::Parse_Vector_wrapper<Parser,SizeParser,Container>::insert(iterator pos,
 // 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 f1bdf85fd..7b30ef5b1 100644
--- a/Packets/ParseVec.cti
+++ b/Packets/ParseVec.cti
@@ -225,4 +225,5 @@ prefix_ void senf::Parse_Vector_wrapper<Parser,SizeParser,Container>::clear()
 // 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 2d2b0b5bb..fe01842d7 100644
--- a/Packets/ParseVec.hh
+++ b/Packets/ParseVec.hh
@@ -176,4 +176,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 42afcb0d0..a66e1bdd3 100644
--- a/Packets/ParseVec.test.cc
+++ b/Packets/ParseVec.test.cc
@@ -154,4 +154,5 @@ BOOST_AUTO_UNIT_TEST(parserTraits_test)
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Packets/ParserBase.cti b/Packets/ParserBase.cti
index 4cd419813..3f49eca3e 100644
--- a/Packets/ParserBase.cti
+++ b/Packets/ParserBase.cti
@@ -97,4 +97,5 @@ prefix_ unsigned senf::min_bytes()
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Packets/ParserBase.hh b/Packets/ParserBase.hh
index dcdce00fc..a985645a9 100644
--- a/Packets/ParserBase.hh
+++ b/Packets/ParserBase.hh
@@ -310,4 +310,5 @@ namespace senf {
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Packets/ParserBase.ih b/Packets/ParserBase.ih
index 8eee2346d..5606977c3 100644
--- a/Packets/ParserBase.ih
+++ b/Packets/ParserBase.ih
@@ -100,4 +100,5 @@ namespace impl {
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Packets/ParserBase.test.cc b/Packets/ParserBase.test.cc
index a2800033c..213cbd714 100644
--- a/Packets/ParserBase.test.cc
+++ b/Packets/ParserBase.test.cc
@@ -107,4 +107,5 @@ BOOST_AUTO_UNIT_TEST(parserBase_construction)
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Packets/RTPBundle/RTCPPacket.cc b/Packets/RTPBundle/RTCPPacket.cc
index bf4ecc0a3..1985a678f 100644
--- a/Packets/RTPBundle/RTCPPacket.cc
+++ b/Packets/RTPBundle/RTCPPacket.cc
@@ -52,4 +52,5 @@ prefix_ void senf::RTCPPacket::v_finalize()
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Packets/RTPBundle/RTCPPacket.cti b/Packets/RTPBundle/RTCPPacket.cti
index b65c9c675..eb377a0e2 100644
--- a/Packets/RTPBundle/RTCPPacket.cti
+++ b/Packets/RTPBundle/RTCPPacket.cti
@@ -45,4 +45,5 @@ prefix_ senf::RTCPPacket::RTCPPacket(Arg const & arg)
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Packets/RTPBundle/RTCPPacket.hh b/Packets/RTPBundle/RTCPPacket.hh
index fb71573d0..e0532f95b 100644
--- a/Packets/RTPBundle/RTCPPacket.hh
+++ b/Packets/RTPBundle/RTCPPacket.hh
@@ -316,4 +316,5 @@ namespace senf {
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Packets/RTPBundle/RTCPPacket.test.cc b/Packets/RTPBundle/RTCPPacket.test.cc
index 0380c7c40..06c7a7411 100644
--- a/Packets/RTPBundle/RTCPPacket.test.cc
+++ b/Packets/RTPBundle/RTCPPacket.test.cc
@@ -340,4 +340,5 @@ BOOST_AUTO_UNIT_TEST(rtcpPacket_packet)
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Packets/RTPBundle/RTPPacket.cc b/Packets/RTPBundle/RTPPacket.cc
index ed1eaa89e..c53270d6a 100644
--- a/Packets/RTPBundle/RTPPacket.cc
+++ b/Packets/RTPBundle/RTPPacket.cc
@@ -106,4 +106,5 @@ prefix_ void senf::RTPUnknownExtensionPacket::v_finalize()
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Packets/RTPBundle/RTPPacket.cti b/Packets/RTPBundle/RTPPacket.cti
index 4c11a838e..d462c1fbe 100644
--- a/Packets/RTPBundle/RTPPacket.cti
+++ b/Packets/RTPBundle/RTPPacket.cti
@@ -57,4 +57,5 @@ RTPUnknownExtensionPacket(Arg const & arg)
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Packets/RTPBundle/RTPPacket.hh b/Packets/RTPBundle/RTPPacket.hh
index 17be86ab7..512ba88a9 100644
--- a/Packets/RTPBundle/RTPPacket.hh
+++ b/Packets/RTPBundle/RTPPacket.hh
@@ -225,4 +225,5 @@ namespace senf {
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Packets/RTPBundle/RTPPacket.test.cc b/Packets/RTPBundle/RTPPacket.test.cc
index 63311f971..9311ffe09 100644
--- a/Packets/RTPBundle/RTPPacket.test.cc
+++ b/Packets/RTPBundle/RTPPacket.test.cc
@@ -247,4 +247,5 @@ BOOST_AUTO_UNIT_TEST(eth_rtpPacket_packet)
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Packets/RTPBundle/main.test.cc b/Packets/RTPBundle/main.test.cc
index a7b3fb509..7607fdcbc 100644
--- a/Packets/RTPBundle/main.test.cc
+++ b/Packets/RTPBundle/main.test.cc
@@ -45,4 +45,5 @@
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Packets/docstub.hh b/Packets/docstub.hh
index 3bfd41dc5..29cf7e086 100644
--- a/Packets/docstub.hh
+++ b/Packets/docstub.hh
@@ -60,4 +60,5 @@ namespace std {
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Packets/main.test.cc b/Packets/main.test.cc
index 15b8f3138..b759387fb 100644
--- a/Packets/main.test.cc
+++ b/Packets/main.test.cc
@@ -45,4 +45,5 @@
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Packets/typeidvalue.cci b/Packets/typeidvalue.cci
index bb65104e7..1d6526911 100644
--- a/Packets/typeidvalue.cci
+++ b/Packets/typeidvalue.cci
@@ -79,4 +79,5 @@ prefix_ senf::TypeIdValue const senf::typeIdValue()
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Packets/typeidvalue.cti b/Packets/typeidvalue.cti
index eed794b3c..ebebe47e1 100644
--- a/Packets/typeidvalue.cti
+++ b/Packets/typeidvalue.cti
@@ -64,4 +64,5 @@ prefix_ senf::TypeIdValue const senf::typeIdValue()
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Packets/typeidvalue.hh b/Packets/typeidvalue.hh
index cd6389bf6..a212051b5 100644
--- a/Packets/typeidvalue.hh
+++ b/Packets/typeidvalue.hh
@@ -105,4 +105,5 @@ namespace senf {
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Scheduler/ReadHelper.cci b/Scheduler/ReadHelper.cci
index 944c5ef4e..17ffa4adf 100644
--- a/Scheduler/ReadHelper.cci
+++ b/Scheduler/ReadHelper.cci
@@ -46,4 +46,5 @@ prefix_ std::string::size_type senf::ReadUntil::operator()(std::string const & d
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Scheduler/ReadHelper.ct b/Scheduler/ReadHelper.ct
index 35fbc1c3b..ce7e75c92 100644
--- a/Scheduler/ReadHelper.ct
+++ b/Scheduler/ReadHelper.ct
@@ -120,4 +120,5 @@ operator()(std::string const & data)
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Scheduler/ReadHelper.cti b/Scheduler/ReadHelper.cti
index 8fd8ae254..380091ad0 100644
--- a/Scheduler/ReadHelper.cti
+++ b/Scheduler/ReadHelper.cti
@@ -108,4 +108,5 @@ prefix_ void senf::ReadHelper<Handle>::throw_error()
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Scheduler/ReadHelper.hh b/Scheduler/ReadHelper.hh
index 2b7bdb30e..449532f84 100644
--- a/Scheduler/ReadHelper.hh
+++ b/Scheduler/ReadHelper.hh
@@ -178,4 +178,5 @@ namespace senf {
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Scheduler/ReadHelper.ih b/Scheduler/ReadHelper.ih
index e73892f93..619574b54 100644
--- a/Scheduler/ReadHelper.ih
+++ b/Scheduler/ReadHelper.ih
@@ -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/Scheduler/ReadHelper.test.cc b/Scheduler/ReadHelper.test.cc
index 9e5f589dc..79b071581 100644
--- a/Scheduler/ReadHelper.test.cc
+++ b/Scheduler/ReadHelper.test.cc
@@ -29,4 +29,5 @@
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Scheduler/Scheduler.cc b/Scheduler/Scheduler.cc
index 65b3f0998..ed6649df5 100644
--- a/Scheduler/Scheduler.cc
+++ b/Scheduler/Scheduler.cc
@@ -233,4 +233,5 @@ prefix_ void senf::Scheduler::process()
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Scheduler/Scheduler.cci b/Scheduler/Scheduler.cci
index 8bdf5b085..230870545 100644
--- a/Scheduler/Scheduler.cci
+++ b/Scheduler/Scheduler.cci
@@ -52,4 +52,5 @@ prefix_ int senf::retrieve_filehandle(int fd)
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Scheduler/Scheduler.cti b/Scheduler/Scheduler.cti
index d263e4ab3..e3cb21f4f 100644
--- a/Scheduler/Scheduler.cti
+++ b/Scheduler/Scheduler.cti
@@ -61,4 +61,5 @@ prefix_ void senf::Scheduler::remove(Handle const & handle, int eventMask)
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Scheduler/Scheduler.hh b/Scheduler/Scheduler.hh
index fb1aebf2f..12b4b6cf0 100644
--- a/Scheduler/Scheduler.hh
+++ b/Scheduler/Scheduler.hh
@@ -234,4 +234,5 @@ namespace senf {
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Scheduler/Scheduler.test.cc b/Scheduler/Scheduler.test.cc
index 64a0d3dfb..0e178691a 100644
--- a/Scheduler/Scheduler.test.cc
+++ b/Scheduler/Scheduler.test.cc
@@ -264,4 +264,5 @@ BOOST_AUTO_UNIT_TEST(scheduler)
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Scheduler/WriteHelper.ct b/Scheduler/WriteHelper.ct
index f573f95d6..0b18fcc49 100644
--- a/Scheduler/WriteHelper.ct
+++ b/Scheduler/WriteHelper.ct
@@ -113,4 +113,5 @@ prefix_ void senf::WriteHelper<Handle>::done()
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Scheduler/WriteHelper.cti b/Scheduler/WriteHelper.cti
index 53c8433a4..12e7e0f76 100644
--- a/Scheduler/WriteHelper.cti
+++ b/Scheduler/WriteHelper.cti
@@ -77,4 +77,5 @@ prefix_ void senf::WriteHelper<Handle>::throw_error()
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Scheduler/WriteHelper.hh b/Scheduler/WriteHelper.hh
index aa6af1c97..65b58a81a 100644
--- a/Scheduler/WriteHelper.hh
+++ b/Scheduler/WriteHelper.hh
@@ -127,4 +127,5 @@ namespace senf {
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Scheduler/WriteHelper.test.cc b/Scheduler/WriteHelper.test.cc
index db9d45d84..ab4f479c2 100644
--- a/Scheduler/WriteHelper.test.cc
+++ b/Scheduler/WriteHelper.test.cc
@@ -29,4 +29,5 @@
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Scheduler/main.test.cc b/Scheduler/main.test.cc
index 15b8f3138..b759387fb 100644
--- a/Scheduler/main.test.cc
+++ b/Scheduler/main.test.cc
@@ -45,4 +45,5 @@
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Socket/AddressingPolicy.hh b/Socket/AddressingPolicy.hh
index 529c30c52..825c2453d 100644
--- a/Socket/AddressingPolicy.hh
+++ b/Socket/AddressingPolicy.hh
@@ -66,4 +66,5 @@ namespace senf {
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Socket/BSDSocketProtocol.cc b/Socket/BSDSocketProtocol.cc
index 7c40cd9ba..889da3cbe 100644
--- a/Socket/BSDSocketProtocol.cc
+++ b/Socket/BSDSocketProtocol.cc
@@ -98,4 +98,5 @@ prefix_ void senf::AddressableBSDSocketProtocol::reuseaddr(bool value)
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Socket/BSDSocketProtocol.hh b/Socket/BSDSocketProtocol.hh
index ff4799255..3743f528f 100644
--- a/Socket/BSDSocketProtocol.hh
+++ b/Socket/BSDSocketProtocol.hh
@@ -107,4 +107,5 @@ namespace senf {
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Socket/BufferingPolicy.cc b/Socket/BufferingPolicy.cc
index 2fc21d19d..099bc1586 100644
--- a/Socket/BufferingPolicy.cc
+++ b/Socket/BufferingPolicy.cc
@@ -84,4 +84,5 @@ prefix_ void senf::SocketBufferingPolicy::sndbuf(FileHandle handle, unsigned siz
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Socket/BufferingPolicy.hh b/Socket/BufferingPolicy.hh
index c595450c8..3d353dda2 100644
--- a/Socket/BufferingPolicy.hh
+++ b/Socket/BufferingPolicy.hh
@@ -85,4 +85,5 @@ namespace senf {
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Socket/ClientSocketHandle.ct b/Socket/ClientSocketHandle.ct
index 9502fd70b..b51abbd6a 100644
--- a/Socket/ClientSocketHandle.ct
+++ b/Socket/ClientSocketHandle.ct
@@ -167,4 +167,5 @@ prefix_ unsigned senf::ClientSocketHandle<Policy>::available()
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Socket/ClientSocketHandle.cti b/Socket/ClientSocketHandle.cti
index 9d56f8704..b3c124045 100644
--- a/Socket/ClientSocketHandle.cti
+++ b/Socket/ClientSocketHandle.cti
@@ -391,4 +391,5 @@ prefix_ std::string senf::ClientSocketHandle<Policy>::dumpState(unsigned lod)
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Socket/ClientSocketHandle.hh b/Socket/ClientSocketHandle.hh
index 0cca5f298..2b6f4250a 100644
--- a/Socket/ClientSocketHandle.hh
+++ b/Socket/ClientSocketHandle.hh
@@ -452,4 +452,5 @@ namespace senf {
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Socket/ClientSocketHandle.ih b/Socket/ClientSocketHandle.ih
index e970c1a16..6ee58369d 100644
--- a/Socket/ClientSocketHandle.ih
+++ b/Socket/ClientSocketHandle.ih
@@ -93,4 +93,5 @@ namespace detail {
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Socket/ClientSocketHandle.test.cc b/Socket/ClientSocketHandle.test.cc
index 11d717da9..37494d79a 100644
--- a/Socket/ClientSocketHandle.test.cc
+++ b/Socket/ClientSocketHandle.test.cc
@@ -148,4 +148,5 @@ BOOST_AUTO_UNIT_TEST(clientSocketHandle)
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Socket/CommunicationPolicy.cc b/Socket/CommunicationPolicy.cc
index 5e6e561a6..d67a92369 100644
--- a/Socket/CommunicationPolicy.cc
+++ b/Socket/CommunicationPolicy.cc
@@ -76,4 +76,5 @@ prefix_ int senf::ConnectedCommunicationPolicy::do_accept(FileHandle handle,
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Socket/CommunicationPolicy.cti b/Socket/CommunicationPolicy.cti
index 6ff7b9304..92b410bf9 100644
--- a/Socket/CommunicationPolicy.cti
+++ b/Socket/CommunicationPolicy.cti
@@ -59,4 +59,5 @@ accept(ServerSocketHandle<Policy> handle,
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Socket/CommunicationPolicy.hh b/Socket/CommunicationPolicy.hh
index f82ed805e..1f8bb0327 100644
--- a/Socket/CommunicationPolicy.hh
+++ b/Socket/CommunicationPolicy.hh
@@ -105,4 +105,5 @@ namespace senf {
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Socket/FileHandle.cc b/Socket/FileHandle.cc
index daae811b2..0cc9b79cf 100644
--- a/Socket/FileHandle.cc
+++ b/Socket/FileHandle.cc
@@ -113,4 +113,5 @@ prefix_ bool senf::FileBody::pollCheck(int fd, bool incoming, bool block)
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Socket/FileHandle.cci b/Socket/FileHandle.cci
index 8038c7fb4..701613179 100644
--- a/Socket/FileHandle.cci
+++ b/Socket/FileHandle.cci
@@ -251,4 +251,5 @@ prefix_ int senf::retrieve_filehandle(FileHandle handle)
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Socket/FileHandle.hh b/Socket/FileHandle.hh
index bc1565171..afb4cd2d3 100644
--- a/Socket/FileHandle.hh
+++ b/Socket/FileHandle.hh
@@ -210,4 +210,5 @@ namespace senf {
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Socket/FileHandle.ih b/Socket/FileHandle.ih
index 5600e490a..380b39f48 100644
--- a/Socket/FileHandle.ih
+++ b/Socket/FileHandle.ih
@@ -146,4 +146,5 @@ namespace senf {
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Socket/FileHandle.test.cc b/Socket/FileHandle.test.cc
index 93c15ea82..21b3708b5 100644
--- a/Socket/FileHandle.test.cc
+++ b/Socket/FileHandle.test.cc
@@ -119,4 +119,5 @@ BOOST_AUTO_UNIT_TEST(fileHandle)
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Socket/FramingPolicy.hh b/Socket/FramingPolicy.hh
index 2e7785d17..1bae2d110 100644
--- a/Socket/FramingPolicy.hh
+++ b/Socket/FramingPolicy.hh
@@ -78,4 +78,5 @@ namespace senf {
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Socket/GenericAddressingPolicy.cc b/Socket/GenericAddressingPolicy.cc
index 1d577cc31..2a179a9f2 100644
--- a/Socket/GenericAddressingPolicy.cc
+++ b/Socket/GenericAddressingPolicy.cc
@@ -99,4 +99,5 @@ prefix_ void senf::GenericAddressingPolicy_Base::do_connect(FileHandle handle,
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Socket/GenericAddressingPolicy.cti b/Socket/GenericAddressingPolicy.cti
index 28b5337fe..5f7a4a72d 100644
--- a/Socket/GenericAddressingPolicy.cti
+++ b/Socket/GenericAddressingPolicy.cti
@@ -79,4 +79,5 @@ prefix_ void senf::GenericAddressingPolicy<Address>::bind(FileHandle handle,
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Socket/GenericAddressingPolicy.hh b/Socket/GenericAddressingPolicy.hh
index 569efdcd7..07e67b9d8 100644
--- a/Socket/GenericAddressingPolicy.hh
+++ b/Socket/GenericAddressingPolicy.hh
@@ -130,4 +130,5 @@ namespace senf {
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Socket/GenericSockAddr.cci b/Socket/GenericSockAddr.cci
index 5a637257c..3aa05af4e 100644
--- a/Socket/GenericSockAddr.cci
+++ b/Socket/GenericSockAddr.cci
@@ -57,4 +57,5 @@ prefix_ unsigned senf::GenericSockAddr::sockaddr_len()
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Socket/GenericSockAddr.hh b/Socket/GenericSockAddr.hh
index 793463e66..6cbc70686 100644
--- a/Socket/GenericSockAddr.hh
+++ b/Socket/GenericSockAddr.hh
@@ -106,4 +106,5 @@ namespace senf {
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Socket/INetAddressing.cc b/Socket/INetAddressing.cc
index 941b95e78..b97777028 100644
--- a/Socket/INetAddressing.cc
+++ b/Socket/INetAddressing.cc
@@ -232,4 +232,5 @@ prefix_ void senf::INet6SocketAddress::assignIface(std::string const & iface)
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Socket/INetAddressing.cci b/Socket/INetAddressing.cci
index 4d5bf4007..45802bcc3 100644
--- a/Socket/INetAddressing.cci
+++ b/Socket/INetAddressing.cci
@@ -243,4 +243,5 @@ prefix_ std::ostream & senf::operator<<(std::ostream & os, INet6SocketAddress co
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Socket/INetAddressing.ct b/Socket/INetAddressing.ct
index 876addbfb..db187b309 100644
--- a/Socket/INetAddressing.ct
+++ b/Socket/INetAddressing.ct
@@ -53,4 +53,5 @@ prefix_ senf::INet6Address::INet6Address(Range const & range)
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Socket/INetAddressing.hh b/Socket/INetAddressing.hh
index f8a74d141..a9f172c70 100644
--- a/Socket/INetAddressing.hh
+++ b/Socket/INetAddressing.hh
@@ -347,4 +347,5 @@ namespace senf {
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Socket/INetAddressing.test.cc b/Socket/INetAddressing.test.cc
index 1ddfebbe9..48398e6c8 100644
--- a/Socket/INetAddressing.test.cc
+++ b/Socket/INetAddressing.test.cc
@@ -171,4 +171,5 @@ BOOST_AUTO_UNIT_TEST(inet6Address)
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Socket/INetProtocol.cc b/Socket/INetProtocol.cc
index 7125c9135..fff10c01d 100644
--- a/Socket/INetProtocol.cc
+++ b/Socket/INetProtocol.cc
@@ -82,4 +82,5 @@ prefix_ void senf::IPv6Protocol::bind(INet6SocketAddress const & address)
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Socket/INetProtocol.hh b/Socket/INetProtocol.hh
index 12ee76c34..df3cea136 100644
--- a/Socket/INetProtocol.hh
+++ b/Socket/INetProtocol.hh
@@ -109,4 +109,5 @@ namespace senf {
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Socket/LLAddressing.cc b/Socket/LLAddressing.cc
index e362068f7..c5d5c0050 100644
--- a/Socket/LLAddressing.cc
+++ b/Socket/LLAddressing.cc
@@ -131,4 +131,5 @@ senf::llAddress(std::string address)
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Socket/LLAddressing.cci b/Socket/LLAddressing.cci
index ce3866d63..93deeb351 100644
--- a/Socket/LLAddressing.cci
+++ b/Socket/LLAddressing.cci
@@ -116,4 +116,5 @@ prefix_ unsigned senf::LLSocketAddress::sockaddr_len()
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Socket/LLAddressing.ct b/Socket/LLAddressing.ct
index 300d20d7c..52130e3f6 100644
--- a/Socket/LLAddressing.ct
+++ b/Socket/LLAddressing.ct
@@ -89,4 +89,5 @@ prefix_ unsigned char senf::detail::HexConverter::operator()(ForwardRange const
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Socket/LLAddressing.cti b/Socket/LLAddressing.cti
index 7b077099e..42e9934a5 100644
--- a/Socket/LLAddressing.cti
+++ b/Socket/LLAddressing.cti
@@ -53,4 +53,5 @@ LLSocketAddress(ForwardRange const & address, std::string interface,
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Socket/LLAddressing.hh b/Socket/LLAddressing.hh
index 5bc6a4f1a..779312316 100644
--- a/Socket/LLAddressing.hh
+++ b/Socket/LLAddressing.hh
@@ -193,4 +193,5 @@ namespace senf {
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Socket/LLAddressing.ih b/Socket/LLAddressing.ih
index ddfd87479..a5d7397bc 100644
--- a/Socket/LLAddressing.ih
+++ b/Socket/LLAddressing.ih
@@ -66,4 +66,5 @@ namespace detail {
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Socket/LLAddressing.test.cc b/Socket/LLAddressing.test.cc
index b9bd75803..7e1a06029 100644
--- a/Socket/LLAddressing.test.cc
+++ b/Socket/LLAddressing.test.cc
@@ -86,4 +86,5 @@ BOOST_AUTO_UNIT_TEST(llAddress)
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Socket/PacketSocketHandle.cc b/Socket/PacketSocketHandle.cc
index 0965aec7c..7250c8c46 100644
--- a/Socket/PacketSocketHandle.cc
+++ b/Socket/PacketSocketHandle.cc
@@ -105,4 +105,5 @@ prefix_ void senf::PacketProtocol::do_mc_i(std::string interface,
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Socket/PacketSocketHandle.ct b/Socket/PacketSocketHandle.ct
index ba22740e8..5a6eb0c24 100644
--- a/Socket/PacketSocketHandle.ct
+++ b/Socket/PacketSocketHandle.ct
@@ -56,4 +56,5 @@ senf::detail::Range_LLAddressCopier<ForwardRange>::operator()(unsigned char * ta
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Socket/PacketSocketHandle.cti b/Socket/PacketSocketHandle.cti
index f52428023..d22e07715 100644
--- a/Socket/PacketSocketHandle.cti
+++ b/Socket/PacketSocketHandle.cti
@@ -73,4 +73,5 @@ prefix_ void senf::PacketProtocol::do_mc(std::string interface,
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Socket/PacketSocketHandle.hh b/Socket/PacketSocketHandle.hh
index 1f2eb0f33..a435369ba 100644
--- a/Socket/PacketSocketHandle.hh
+++ b/Socket/PacketSocketHandle.hh
@@ -172,4 +172,5 @@ namespace senf {
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Socket/PacketSocketHandle.ih b/Socket/PacketSocketHandle.ih
index 9a1db1ccb..58ab1a94f 100644
--- a/Socket/PacketSocketHandle.ih
+++ b/Socket/PacketSocketHandle.ih
@@ -81,4 +81,5 @@ namespace detail {
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Socket/PacketSocketHandle.test.cc b/Socket/PacketSocketHandle.test.cc
index 562f2c0e2..f579885f7 100644
--- a/Socket/PacketSocketHandle.test.cc
+++ b/Socket/PacketSocketHandle.test.cc
@@ -76,4 +76,5 @@ BOOST_AUTO_UNIT_TEST(packetSocketHandle)
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Socket/ProtocolClientSocketHandle.cti b/Socket/ProtocolClientSocketHandle.cti
index 33f73276c..751cf80b4 100644
--- a/Socket/ProtocolClientSocketHandle.cti
+++ b/Socket/ProtocolClientSocketHandle.cti
@@ -113,4 +113,5 @@ senf::ProtocolClientSocketHandle<SocketProtocol>::dumpState(unsigned lod)
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Socket/ProtocolClientSocketHandle.hh b/Socket/ProtocolClientSocketHandle.hh
index f64848b6c..bc39504d3 100644
--- a/Socket/ProtocolClientSocketHandle.hh
+++ b/Socket/ProtocolClientSocketHandle.hh
@@ -136,4 +136,5 @@ namespace senf {
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Socket/ProtocolClientSocketHandle.test.cc b/Socket/ProtocolClientSocketHandle.test.cc
index a2edda82d..ad37183b3 100644
--- a/Socket/ProtocolClientSocketHandle.test.cc
+++ b/Socket/ProtocolClientSocketHandle.test.cc
@@ -78,4 +78,5 @@ BOOST_AUTO_UNIT_TEST(protocolClientSocketHandle)
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Socket/ProtocolServerSocketHandle.cti b/Socket/ProtocolServerSocketHandle.cti
index 7d0497701..b104c49c5 100644
--- a/Socket/ProtocolServerSocketHandle.cti
+++ b/Socket/ProtocolServerSocketHandle.cti
@@ -119,4 +119,5 @@ ProtocolServerSocketHandle(FileHandle other, bool isChecked)
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Socket/ProtocolServerSocketHandle.hh b/Socket/ProtocolServerSocketHandle.hh
index 673e50007..d0a358fa1 100644
--- a/Socket/ProtocolServerSocketHandle.hh
+++ b/Socket/ProtocolServerSocketHandle.hh
@@ -141,4 +141,5 @@ namespace senf {
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Socket/ProtocolServerSocketHandle.test.cc b/Socket/ProtocolServerSocketHandle.test.cc
index 00ac46baa..424372979 100644
--- a/Socket/ProtocolServerSocketHandle.test.cc
+++ b/Socket/ProtocolServerSocketHandle.test.cc
@@ -91,4 +91,5 @@ BOOST_AUTO_UNIT_TEST(protocolServerSocketHandle)
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Socket/ReadWritePolicy.cc b/Socket/ReadWritePolicy.cc
index 30fcbf711..d5c10c49c 100644
--- a/Socket/ReadWritePolicy.cc
+++ b/Socket/ReadWritePolicy.cc
@@ -133,4 +133,5 @@ prefix_ unsigned senf::WriteablePolicy::do_writeto(FileHandle handle,
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Socket/ReadWritePolicy.cti b/Socket/ReadWritePolicy.cti
index 6a2bf027e..7bd6ceb44 100644
--- a/Socket/ReadWritePolicy.cti
+++ b/Socket/ReadWritePolicy.cti
@@ -69,4 +69,5 @@ writeto(ClientSocketHandle<Policy> handle,
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Socket/ReadWritePolicy.hh b/Socket/ReadWritePolicy.hh
index e8846694a..f5f7207b8 100644
--- a/Socket/ReadWritePolicy.hh
+++ b/Socket/ReadWritePolicy.hh
@@ -158,4 +158,5 @@ namespace senf {
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Socket/ServerSocketHandle.cti b/Socket/ServerSocketHandle.cti
index 7617ed1bb..715a9a6ad 100644
--- a/Socket/ServerSocketHandle.cti
+++ b/Socket/ServerSocketHandle.cti
@@ -169,4 +169,5 @@ prefix_ std::string senf::ServerSocketHandle<Policy>::dumpState(unsigned lod)
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Socket/ServerSocketHandle.hh b/Socket/ServerSocketHandle.hh
index 5fa2126bf..879416b6b 100644
--- a/Socket/ServerSocketHandle.hh
+++ b/Socket/ServerSocketHandle.hh
@@ -223,4 +223,5 @@ namespace senf {
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Socket/ServerSocketHandle.test.cc b/Socket/ServerSocketHandle.test.cc
index 263b21ff2..649585610 100644
--- a/Socket/ServerSocketHandle.test.cc
+++ b/Socket/ServerSocketHandle.test.cc
@@ -102,4 +102,5 @@ BOOST_AUTO_UNIT_TEST(serverSocketHandle)
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Socket/SocketHandle.cc b/Socket/SocketHandle.cc
index 8365bf7e1..4d0b8fce4 100644
--- a/Socket/SocketHandle.cc
+++ b/Socket/SocketHandle.cc
@@ -116,4 +116,5 @@ prefix_ std::ostream & senf::operator<<(std::ostream & os, SocketHandle<Policy>
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Socket/SocketHandle.cci b/Socket/SocketHandle.cci
index 42f2a0c4a..25ddfc140 100644
--- a/Socket/SocketHandle.cci
+++ b/Socket/SocketHandle.cci
@@ -81,4 +81,5 @@ prefix_ senf::detail::ConvertibleString::ConvertibleString(bool v)
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Socket/SocketHandle.ct b/Socket/SocketHandle.ct
index 11d309ce6..96c5b131d 100644
--- a/Socket/SocketHandle.ct
+++ b/Socket/SocketHandle.ct
@@ -53,4 +53,5 @@ senf::detail::ConvertibleString::operator+=(ConvertibleString const & other)
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Socket/SocketHandle.cti b/Socket/SocketHandle.cti
index 46a1df893..05b3790b7 100644
--- a/Socket/SocketHandle.cti
+++ b/Socket/SocketHandle.cti
@@ -200,4 +200,5 @@ prefix_ senf::detail::ConvertibleString::ConvertibleString(T const & other)
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Socket/SocketHandle.hh b/Socket/SocketHandle.hh
index c41336620..808b3c1ba 100644
--- a/Socket/SocketHandle.hh
+++ b/Socket/SocketHandle.hh
@@ -266,4 +266,5 @@ namespace senf {
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Socket/SocketHandle.ih b/Socket/SocketHandle.ih
index 0b4707925..5bef63a65 100644
--- a/Socket/SocketHandle.ih
+++ b/Socket/SocketHandle.ih
@@ -175,4 +175,5 @@ namespace senf {
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Socket/SocketHandle.test.cc b/Socket/SocketHandle.test.cc
index c1ac392db..f2e31a718 100644
--- a/Socket/SocketHandle.test.cc
+++ b/Socket/SocketHandle.test.cc
@@ -107,4 +107,5 @@ BOOST_AUTO_UNIT_TEST(socketHandle)
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Socket/SocketPolicy.ct b/Socket/SocketPolicy.ct
index f6d97d5c7..6a56e31c7 100644
--- a/Socket/SocketPolicy.ct
+++ b/Socket/SocketPolicy.ct
@@ -60,4 +60,5 @@ checkBaseOf(SocketPolicyBase const & other)
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Socket/SocketPolicy.hh b/Socket/SocketPolicy.hh
index e7bd1abd5..e3907fe9c 100644
--- a/Socket/SocketPolicy.hh
+++ b/Socket/SocketPolicy.hh
@@ -558,4 +558,5 @@ namespace senf {
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Socket/SocketPolicy.ih b/Socket/SocketPolicy.ih
index 3f0b8cc2f..09ccc3919 100644
--- a/Socket/SocketPolicy.ih
+++ b/Socket/SocketPolicy.ih
@@ -242,4 +242,5 @@ namespace impl {
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Socket/SocketPolicy.test.cc b/Socket/SocketPolicy.test.cc
index a34240629..84a830cbd 100644
--- a/Socket/SocketPolicy.test.cc
+++ b/Socket/SocketPolicy.test.cc
@@ -151,4 +151,5 @@ BOOST_AUTO_UNIT_TEST(socketPolicy)
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Socket/SocketPolicy.test.hh b/Socket/SocketPolicy.test.hh
index d10994051..065ec465c 100644
--- a/Socket/SocketPolicy.test.hh
+++ b/Socket/SocketPolicy.test.hh
@@ -131,4 +131,5 @@ namespace test {
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Socket/SocketProtocol.cc b/Socket/SocketProtocol.cc
index fc5fd4c89..395d27fb4 100644
--- a/Socket/SocketProtocol.cc
+++ b/Socket/SocketProtocol.cc
@@ -49,4 +49,5 @@ prefix_ void senf::SocketProtocol::state(SocketStateMap & map, unsigned lod)
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Socket/SocketProtocol.cci b/Socket/SocketProtocol.cci
index f2a5fd5fd..7ecf0b04c 100644
--- a/Socket/SocketProtocol.cci
+++ b/Socket/SocketProtocol.cci
@@ -57,4 +57,5 @@ prefix_ senf::SocketBody & senf::SocketProtocol::body()
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Socket/SocketProtocol.cti b/Socket/SocketProtocol.cti
index e5e04789e..df1c82346 100644
--- a/Socket/SocketProtocol.cti
+++ b/Socket/SocketProtocol.cti
@@ -54,4 +54,5 @@ senf::ConcreteSocketProtocol<SocketPolicy>::policy()
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Socket/SocketProtocol.hh b/Socket/SocketProtocol.hh
index 24a8ff8a5..839fdeba9 100644
--- a/Socket/SocketProtocol.hh
+++ b/Socket/SocketProtocol.hh
@@ -278,4 +278,5 @@ namespace senf {
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Socket/SocketProtocol.test.cc b/Socket/SocketProtocol.test.cc
index 47799b3af..2168488f2 100644
--- a/Socket/SocketProtocol.test.cc
+++ b/Socket/SocketProtocol.test.cc
@@ -57,4 +57,5 @@ BOOST_AUTO_UNIT_TEST(socketProtocol)
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Socket/SocketProtocol.test.hh b/Socket/SocketProtocol.test.hh
index e70b7f1ce..88acc46ba 100644
--- a/Socket/SocketProtocol.test.hh
+++ b/Socket/SocketProtocol.test.hh
@@ -69,4 +69,5 @@ namespace test {
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Socket/TCPProtocol.cc b/Socket/TCPProtocol.cc
index 4dbb56da5..57ffef896 100644
--- a/Socket/TCPProtocol.cc
+++ b/Socket/TCPProtocol.cc
@@ -100,4 +100,5 @@ prefix_ bool senf::TCPProtocol::eof()
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Socket/TCPProtocol.hh b/Socket/TCPProtocol.hh
index ce84dc1c5..e22905191 100644
--- a/Socket/TCPProtocol.hh
+++ b/Socket/TCPProtocol.hh
@@ -85,4 +85,5 @@ namespace senf {
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Socket/TCPSocketHandle.cc b/Socket/TCPSocketHandle.cc
index ffabdc2b2..2f7f0ad4e 100644
--- a/Socket/TCPSocketHandle.cc
+++ b/Socket/TCPSocketHandle.cc
@@ -142,4 +142,5 @@ prefix_ std::auto_ptr<senf::SocketProtocol> senf::TCPv6SocketProtocol::clone()
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Socket/TCPSocketHandle.hh b/Socket/TCPSocketHandle.hh
index 4104dc355..c4c6c94f8 100644
--- a/Socket/TCPSocketHandle.hh
+++ b/Socket/TCPSocketHandle.hh
@@ -233,4 +233,5 @@ namespace senf {
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Socket/TCPSocketHandle.test.cc b/Socket/TCPSocketHandle.test.cc
index b0d4863f7..0889d6db1 100644
--- a/Socket/TCPSocketHandle.test.cc
+++ b/Socket/TCPSocketHandle.test.cc
@@ -398,4 +398,5 @@ BOOST_AUTO_UNIT_TEST(tcpv6ServerSocketHandle)
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Socket/UDPProtocol.cc b/Socket/UDPProtocol.cc
index 5cc9f81ce..af5d91e11 100644
--- a/Socket/UDPProtocol.cc
+++ b/Socket/UDPProtocol.cc
@@ -163,4 +163,5 @@ prefix_ void senf::UDPProtocol::mcTTL(unsigned value)
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Socket/UDPProtocol.hh b/Socket/UDPProtocol.hh
index 6ac49066c..55ab3143e 100644
--- a/Socket/UDPProtocol.hh
+++ b/Socket/UDPProtocol.hh
@@ -123,4 +123,5 @@ namespace senf {
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Socket/UDPSocketHandle.cc b/Socket/UDPSocketHandle.cc
index 020658013..525e53113 100644
--- a/Socket/UDPSocketHandle.cc
+++ b/Socket/UDPSocketHandle.cc
@@ -102,4 +102,5 @@ prefix_ std::auto_ptr<senf::SocketProtocol> senf::UDPv6SocketProtocol::clone()
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Socket/UDPSocketHandle.hh b/Socket/UDPSocketHandle.hh
index 72a4f5543..62362b4bc 100644
--- a/Socket/UDPSocketHandle.hh
+++ b/Socket/UDPSocketHandle.hh
@@ -198,4 +198,5 @@ namespace senf {
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Socket/UDPSocketHandle.test.cc b/Socket/UDPSocketHandle.test.cc
index 1af999fe9..f9e937f98 100644
--- a/Socket/UDPSocketHandle.test.cc
+++ b/Socket/UDPSocketHandle.test.cc
@@ -176,4 +176,5 @@ BOOST_AUTO_UNIT_TEST(udpv4ClientSocketHandle)
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Socket/main.test.cc b/Socket/main.test.cc
index 15b8f3138..b759387fb 100644
--- a/Socket/main.test.cc
+++ b/Socket/main.test.cc
@@ -45,4 +45,5 @@
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Utils/Buffer.hh b/Utils/Buffer.hh
index 3ff2349ea..aa4bba900 100644
--- a/Utils/Buffer.hh
+++ b/Utils/Buffer.hh
@@ -114,4 +114,5 @@
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Utils/DaemonTools.cc b/Utils/DaemonTools.cc
index ba26cc7c3..06db1a0a0 100644
--- a/Utils/DaemonTools.cc
+++ b/Utils/DaemonTools.cc
@@ -69,4 +69,5 @@ prefix_ void senf::redirect_stdio(std::string const & path)
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Utils/DaemonTools.hh b/Utils/DaemonTools.hh
index d1b85f1a2..15e4e7d81 100644
--- a/Utils/DaemonTools.hh
+++ b/Utils/DaemonTools.hh
@@ -82,4 +82,5 @@ namespace senf {
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Utils/Exception.cc b/Utils/Exception.cc
index a1ae061f4..80b6c98bd 100644
--- a/Utils/Exception.cc
+++ b/Utils/Exception.cc
@@ -62,4 +62,5 @@ prefix_ char const * senf::SystemException::what()
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Utils/Exception.cci b/Utils/Exception.cci
index a9830b5ee..9c3a383a4 100644
--- a/Utils/Exception.cci
+++ b/Utils/Exception.cci
@@ -52,4 +52,5 @@ prefix_  senf::SystemException::~SystemException()
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Utils/Exception.hh b/Utils/Exception.hh
index d7e86d592..cc37ee131 100644
--- a/Utils/Exception.hh
+++ b/Utils/Exception.hh
@@ -87,4 +87,5 @@ namespace senf {
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Utils/IteratorTraits.cti b/Utils/IteratorTraits.cti
index 9134732cf..75c42f7c1 100644
--- a/Utils/IteratorTraits.cti
+++ b/Utils/IteratorTraits.cti
@@ -47,4 +47,5 @@ prefix_ typename std::iterator_traits<Iterator>::pointer senf::storage_iterator(
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Utils/IteratorTraits.hh b/Utils/IteratorTraits.hh
index 92cae92da..12fd22376 100644
--- a/Utils/IteratorTraits.hh
+++ b/Utils/IteratorTraits.hh
@@ -86,4 +86,5 @@ namespace senf {
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Utils/IteratorTraits.ih b/Utils/IteratorTraits.ih
index 871c688e1..1abcb6a6f 100644
--- a/Utils/IteratorTraits.ih
+++ b/Utils/IteratorTraits.ih
@@ -62,4 +62,5 @@ namespace senf {
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Utils/IteratorTraits.test.cc b/Utils/IteratorTraits.test.cc
index f5aa2cca9..820b07c60 100644
--- a/Utils/IteratorTraits.test.cc
+++ b/Utils/IteratorTraits.test.cc
@@ -55,4 +55,5 @@ BOOST_AUTO_UNIT_TEST(iteratorTraits)
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Utils/Logger.hh b/Utils/Logger.hh
index ef649fc0a..7b568e87c 100644
--- a/Utils/Logger.hh
+++ b/Utils/Logger.hh
@@ -217,4 +217,5 @@ namespace senf {
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Utils/Logger.test.cc b/Utils/Logger.test.cc
index c7892da79..4498bcf5b 100644
--- a/Utils/Logger.test.cc
+++ b/Utils/Logger.test.cc
@@ -67,4 +67,5 @@ BOOST_AUTO_UNIT_TEST(logger)
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Utils/MicroTime.cc b/Utils/MicroTime.cc
index 1f1ea617a..4a19fdf4b 100644
--- a/Utils/MicroTime.cc
+++ b/Utils/MicroTime.cc
@@ -55,4 +55,5 @@ prefix_ senf::MicroTime senf::now()
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Utils/MicroTime.hh b/Utils/MicroTime.hh
index bdeeed66b..c9b537c47 100644
--- a/Utils/MicroTime.hh
+++ b/Utils/MicroTime.hh
@@ -72,4 +72,5 @@ namespace senf {
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Utils/MicroTime.test.cc b/Utils/MicroTime.test.cc
index aa2eec2cf..18b563f11 100644
--- a/Utils/MicroTime.test.cc
+++ b/Utils/MicroTime.test.cc
@@ -32,4 +32,5 @@ BOOST_AUTO_UNIT_TEST(microTime)
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Utils/SafeBool.cci b/Utils/SafeBool.cci
index 249618590..618be826a 100644
--- a/Utils/SafeBool.cci
+++ b/Utils/SafeBool.cci
@@ -38,4 +38,5 @@ prefix_ senf::SafeBoolBase::~SafeBoolBase()
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Utils/SafeBool.cti b/Utils/SafeBool.cti
index 5c3cf5157..1948e2d95 100644
--- a/Utils/SafeBool.cti
+++ b/Utils/SafeBool.cti
@@ -53,4 +53,5 @@ prefix_ void senf::operator!=(const SafeBool<T>& lhs, const SafeBool<U>& rhs)
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Utils/SafeBool.hh b/Utils/SafeBool.hh
index 02f4151f5..129f6d271 100644
--- a/Utils/SafeBool.hh
+++ b/Utils/SafeBool.hh
@@ -113,4 +113,5 @@ namespace senf {
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Utils/TypeInfo.cc b/Utils/TypeInfo.cc
index 06a2c90c7..1e3606ca8 100644
--- a/Utils/TypeInfo.cc
+++ b/Utils/TypeInfo.cc
@@ -64,4 +64,5 @@ prefix_ std::string senf::prettyName(std::type_info const & type)
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Utils/TypeInfo.hh b/Utils/TypeInfo.hh
index 472ea981e..5a213607d 100644
--- a/Utils/TypeInfo.hh
+++ b/Utils/TypeInfo.hh
@@ -69,4 +69,5 @@ namespace senf {
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Utils/TypeInfo.test.cc b/Utils/TypeInfo.test.cc
index 94c3d41e1..a8e7312e2 100644
--- a/Utils/TypeInfo.test.cc
+++ b/Utils/TypeInfo.test.cc
@@ -68,4 +68,5 @@ BOOST_AUTO_UNIT_TEST(prettyName)
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Utils/impl/membind.hh b/Utils/impl/membind.hh
index 782ed23ad..b2394237f 100644
--- a/Utils/impl/membind.hh
+++ b/Utils/impl/membind.hh
@@ -65,4 +65,5 @@ membind(R (T::* fn)( scPARAMS(A) ), scOBTYPE ob)
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Utils/intrusive_refcount.cci b/Utils/intrusive_refcount.cci
index 9742d6560..b89a6f4df 100644
--- a/Utils/intrusive_refcount.cci
+++ b/Utils/intrusive_refcount.cci
@@ -81,4 +81,5 @@ prefix_ void senf::intrusive_ptr_release(intrusive_refcount* p)
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Utils/intrusive_refcount.hh b/Utils/intrusive_refcount.hh
index b3e2f82df..0fb690a4f 100644
--- a/Utils/intrusive_refcount.hh
+++ b/Utils/intrusive_refcount.hh
@@ -88,4 +88,5 @@ namespace senf {
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Utils/intrusive_refcount.test.cc b/Utils/intrusive_refcount.test.cc
index ab547a9b7..8a550964b 100644
--- a/Utils/intrusive_refcount.test.cc
+++ b/Utils/intrusive_refcount.test.cc
@@ -85,4 +85,5 @@ BOOST_AUTO_UNIT_TEST(intrusive_refcount)
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Utils/main.test.cc b/Utils/main.test.cc
index 8716c4440..5971ff1b8 100644
--- a/Utils/main.test.cc
+++ b/Utils/main.test.cc
@@ -45,4 +45,5 @@
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Utils/membind.hh b/Utils/membind.hh
index 4949d5941..5cb73d095 100644
--- a/Utils/membind.hh
+++ b/Utils/membind.hh
@@ -103,4 +103,5 @@ namespace senf {
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Utils/membind.test.cc b/Utils/membind.test.cc
index 5c4cabfc3..f30a00af0 100644
--- a/Utils/membind.test.cc
+++ b/Utils/membind.test.cc
@@ -73,4 +73,5 @@ BOOST_AUTO_UNIT_TEST(membind)
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/project.el b/project.el
index fef05ab99..fa52c6d6a 100644
--- a/project.el
+++ b/project.el
@@ -27,7 +27,8 @@
 (c-add-style "senf" senf-c-style)
 
 (set (make-local-variable 'ccide-file-vars)
-     '(( fill-column  . 100    )
+     '(( fill-column  . 100 )
+       ( comment-column . 40 )
        ( c-file-style . "senf" )
        ( indent-tabs-mode . nil )
        ( ispell-local-dictionary . "american" )
-- 
GitLab