fixes for ClockService::clock_type -> RestrictedInt change introduced by last commit

[senf.git] / senf / Scheduler / ClockService.cc

diff --git a/senf/Scheduler/ClockService.cc b/senf/Scheduler/ClockService.cc
index c3ee343..cd1a420 100644 (file)
--- 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 */
@@ -30,7 +35,6 @@
 #include <boost/regex.hpp>
 #include <senf/Utils/Console/Traits.hh>
 
-//#include "ClockService.mpp"
 #define prefix_
 //-/////////////////////////////////////////////////////////////////////////////////////////////////
 
@@ -38,11 +42,11 @@ prefix_ void
 senf::parseClockServiceInterval(console::ParseCommandInfo::TokensRange const & tokens,
                                 ClockService::clock_type & out)
 {
-    out = 0;
+    out = senf::ClockService::clock_type(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);
@@ -73,11 +77,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,