switch to new MPL based Fraunhofer FOKUS Public License

[senf.git] / senf / Utils / Format.cc

diff --git a/senf/Utils/Format.cc b/senf/Utils/Format.cc
index 6b6e172..7c1ccc9 100644 (file)
--- a/senf/Utils/Format.cc
+++ b/senf/Utils/Format.cc
@@ -1,24 +1,29 @@
 // $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>
 //
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
-// (at your option) any later version.
+// The contents of this file are subject to the Fraunhofer FOKUS Public License
+// Version 1.0 (the "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at 
+// http://senf.berlios.de/license.html
 //
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
+// The Fraunhofer FOKUS Public License Version 1.0 is based on, 
+// but modifies the Mozilla Public License Version 1.1.
+// See the full license text for the amendments.
 //
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the
-// Free Software Foundation, Inc.,
-// 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+// Software distributed under the License is distributed on an "AS IS" basis, 
+// WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License 
+// for the specific language governing rights and limitations under the License.
+//
+// The Original Code is Fraunhofer FOKUS code.
+//
+// The Initial Developer of the Original Code is Fraunhofer-Gesellschaft e.V. 
+// (registered association), Hansastraße 27 c, 80686 Munich, Germany.
+// All Rights Reserved.
+//
+// Contributor(s):
+//   Stefan Bund <g0dil@berlios.de>
 
 /** \file
     \brief Format non-inline non-template implementation */
@@ -34,12 +39,12 @@
 
 //#include "Format.mpp"
 #define prefix_
-///////////////////////////////cc.p////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 
 namespace {
 
-    char const SIPrefix[] = { 'y', 'z', 'a', 'f', 'p', 'n', 'u', 'm', 
-                              ' ', 
+    char const SIPrefix[] = { 'y', 'z', 'a', 'f', 'p', 'n', 'u', 'm',
+                              ' ',
                               'k', 'M', 'G', 'T', 'P', 'E', 'Z', 'Y' };
     unsigned const SIScales = 8;
 
@@ -59,7 +64,7 @@ prefix_ std::ostream & senf::format::operator<<(std::ostream & os, eng const & v
         os.fill(v_.fill_);
 
     unsigned prec (os.precision());
-    if (prec < 4) 
+    if (prec < 4)
         prec = 4;
     unsigned w (os.width());
     char fill (os.fill());
@@ -68,7 +73,7 @@ prefix_ std::ostream & senf::format::operator<<(std::ostream & os, eng const & v
     std::ios_base::fmtflags align (flags & std::ios_base::adjustfield);
     if (! std::isnan(v_.d_))
         minw += prec+3;
-    
+
     float ref (std::fabs(v_.v_));
     float v (v_.v_);
     float d (0.0);
@@ -93,7 +98,7 @@ prefix_ std::ostream & senf::format::operator<<(std::ostream & os, eng const & v
     if (w > 0) {
         if ((align == 0 || align == std::ios_base::right || align == std::ios_base::internal))
             os << std::setw(prec+2+(w>minw ? w-minw : 0));
-        else 
+        else
             os << std::right << std::setfill(' ') << std::setw(prec+2);
     }
     else
@@ -113,7 +118,7 @@ prefix_ std::ostream & senf::format::operator<<(std::ostream & os, eng const & v
             os << SIPrefix[scale/3+SIScales];
     }
     else if ((flags & std::ios_base::showpoint) || scale != 0)
-        os << ((flags & std::ios_base::uppercase)?'E':'e') 
+        os << ((flags & std::ios_base::uppercase)?'E':'e')
            << std::showpos << std::internal << std::setw(3) << scale;
     else if (w > 0)
         os << "    ";
@@ -135,8 +140,8 @@ prefix_ std::string senf::format::detail::dumpintUnsigned(unsigned long long v,
     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 
+    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)
@@ -155,7 +160,7 @@ prefix_ std::string senf::format::detail::dumpintUnsigned(unsigned long long v,
 unsigned int senf::format::IndentHelper::static_level = 0;
 
 
-///////////////////////////////cc.e////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 #undef prefix_
 //#include "Format.mpp"