Fix documentation build under maverick (doxygen 1.7.1)

[senf.git] / senf / Packets / DumpFormat.cc

diff --git a/senf/Packets/DumpFormat.cc b/senf/Packets/DumpFormat.cc
index 2ce3b3f..8779cbe 100644 (file)
--- a/senf/Packets/DumpFormat.cc
+++ b/senf/Packets/DumpFormat.cc
@@ -1,6 +1,6 @@
 // $Id$
 //
-// Copyright (C) 2009 
+// Copyright (C) 2009
 // Fraunhofer Institute for Open Communication Systems (FOKUS)
 // Competence Center NETwork research (NET), St. Augustin, GERMANY
 //     Stefan Bund <g0dil@berlios.de>
@@ -24,7 +24,7 @@
     \brief DumpFormat non-inline non-template implementation */
 
 #include "Packets.hh"
-#include "DumpFormat.ih"
+//#include "DumpFormat.ih"
 
 // Custom includes
 #include <iostream>
@@ -32,7 +32,7 @@
 
 //#include "DumpFormat.mpp"
 #define prefix_
-///////////////////////////////cc.p////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 
 #ifndef SENF_PACKET_DUMP_COLON_COLUMN
 #define SENF_PACKET_DUMP_COLON_COLUMN 27
@@ -40,43 +40,13 @@
 
 prefix_ std::string senf::fieldName(std::string const & s)
 {
-    std::string t (std::max(unsigned(SENF_PACKET_DUMP_COLON_COLUMN+1), s.size()+5), ' ');
+    std::string t (std::max(std::string::size_type(SENF_PACKET_DUMP_COLON_COLUMN+1), s.size()+5), ' ');
     std::copy(s.begin(), s.end(), t.begin()+2);
     t[t.size()-2] = ':';
     return t;
 }
 
-prefix_ std::string senf::detail::prettySignedNumber(long long v, unsigned bits)
-{
-    if (v<0) return prettyUnsignedNumber(-v,bits,-1);
-    else     return prettyUnsignedNumber(v,bits,+1);
-}
-
-prefix_ std::string senf::detail::prettyUnsignedNumber(unsigned long long v, unsigned bits,
-                                                       int sign)
-{
-    int bytes ((bits+7)/8);
-    int digs (int(2.4*bytes)+1);
-    std::stringstream ss;
-    ss << (sign ? (sign<0 ? "-" : " ") : "") 
-       << "0x" << std::setw(2*bytes) << std::setfill('0') << std::hex 
-       << 1u*v
-       << " (" << std::setw(digs+(sign ? 1 : 0)) << std::setfill(' ') << std::dec;
-    if (sign)
-        ss << sign*static_cast<long long>(v);
-    else
-        ss << 1u*v;
-    ss << ") (";
-    for (int i (bytes-1); i>=0; --i) {
-        char c ((v>>(8*i))&0xff);
-        ss << ((c>=32 && c<=127) ? c : '.');
-    }
-    ss << ')';
-    return ss.str();
-}
-
-
-///////////////////////////////cc.e////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 #undef prefix_
 //#include "DumpFormat.mpp"