X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FScheduler%2FClockService.cc;h=fcd8042f1c91a6af6ec5b5faf7b7f0f4fc9fa5dd;hb=ab7ff164ab5ae711ec09ce2b24228510f1ffdcff;hp=7754f4c2380efe67f3b4532bc2720025e23b9162;hpb=601d1f509f5bb24df167a4dd5a20da67a0af9af8;p=senf.git

diff --git a/senf/Scheduler/ClockService.cc b/senf/Scheduler/ClockService.cc
index 7754f4c..fcd8042 100644
--- a/senf/Scheduler/ClockService.cc
+++ b/senf/Scheduler/ClockService.cc
@@ -2,23 +2,28 @@
 //
 // Copyright (C) 2007
 // 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 ClockService non-inline non-template implementation */
@@ -28,11 +33,11 @@
 
 // Custom includes
 #include <boost/regex.hpp>
-#include "../Utils/Console/Console.hh"
+#include <senf/Utils/Console/Traits.hh>
 
 //#include "ClockService.mpp"
 #define prefix_
-///////////////////////////////cc.p////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 
 prefix_ void
 senf::parseClockServiceInterval(console::ParseCommandInfo::TokensRange const & tokens,
@@ -41,8 +46,8 @@ senf::parseClockServiceInterval(console::ParseCommandInfo::TokensRange const & t
     out = 0;
     std::string value;
     {
-        senf::console::CheckedArgumentIteratorWrapper arg (tokens);
-        senf::console::parse( *(arg++), value );
+        console::CheckedArgumentIteratorWrapper arg (tokens);
+        console::parse( *(arg++), value );
     }
     static boost::sregex_iterator::regex_type rx ("[mun]?[dhms]");
     boost::sregex_iterator i (value.begin(), value.end(), rx);
@@ -57,7 +62,8 @@ senf::parseClockServiceInterval(console::ParseCommandInfo::TokensRange const & t
             scale = *match.first;
             unit = *boost::next(match.first);
         } else {
-            SENF_ASSERT( match.length() == 1);
+            SENF_ASSERT( match.length() == 1,
+                         "Internal failure: RegEx match returns weird number of matches" );
             unit = *match.first;
         }
         switch (scale) {
@@ -72,11 +78,11 @@ senf::parseClockServiceInterval(console::ParseCommandInfo::TokensRange const & t
         case 'm': v *= 60.0;
         case 's': v *= 1000000000.0;
         }
-        out += senf::ClockService::nanoseconds(senf::ClockService::int64_type(v));
+        out += ClockService::nanoseconds(ClockService::int64_type(v));
         j = match.second;
     }
     if (j != value.end())
-        throw senf::console::SyntaxErrorException();
+        throw console::SyntaxErrorException();
 }
 
 prefix_ void senf::formatClockServiceInterval(ClockService::clock_type interval,
@@ -85,7 +91,7 @@ prefix_ void senf::formatClockServiceInterval(ClockService::clock_type interval,
     os << interval << "ns";
 }
 
-///////////////////////////////cc.e////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 #undef prefix_
 //#include "ClockService.mpp"