X-Git-Url: https://git.teslayout.com/public/public/public/?a=blobdiff_plain;f=source%2Ftimex%2Finternal%2FTickProducer.cpp;h=273400dc6fa3b48883cb5035544e5e7ac0e0e254;hb=5a6cba5fde2b2f538a7515f8293cc0a8d9589dfa;hp=bb37833021b713d0a7232a85ab87749bfc278fc3;hpb=3e258840b15577cb8bda3cdedd0b9b88e16404b3;p=anna.git

diff --git a/source/timex/internal/TickProducer.cpp b/source/timex/internal/TickProducer.cpp
index bb37833..273400d 100644
--- a/source/timex/internal/TickProducer.cpp
+++ b/source/timex/internal/TickProducer.cpp
@@ -1,37 +1,9 @@
-// ANNA - Anna is Not Nothingness Anymore
-//
-// (c) Copyright 2005-2014 Eduardo Ramos Testillano & Francisco Ruiz Rayo
-//
-// https://bitbucket.org/testillano/anna
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-// Authors: eduardo.ramos.testillano@gmail.com
-//          cisco.tierra@gmail.com
+// ANNA - Anna is Not Nothingness Anymore                                                         //
+//                                                                                                //
+// (c) Copyright 2005-2015 Eduardo Ramos Testillano & Francisco Ruiz Rayo                         //
+//                                                                                                //
+// See project site at http://redmine.teslayout.com/projects/anna-suite                           //
+// See accompanying file LICENSE or copy at http://www.teslayout.com/projects/public/anna.LICENSE //
 
 
 #include <unistd.h>
@@ -52,8 +24,8 @@ using namespace std;
 using namespace anna;
 
 //static
-void* timex::TickProducer::exec(void* arg)
-throw() {
+void* anna::timex::TickProducer::exec(void* arg)
+{
   sigset_t mask;
   sigemptyset(&mask);
   pthread_sigmask(SIG_SETMASK, &mask, NULL);
@@ -77,7 +49,7 @@ throw() {
   return NULL;
 }
 
-timex::TickProducer::TickProducer(timex::Engine* timeController, const int fdWrite) :
+anna::timex::TickProducer::TickProducer(timex::Engine* timeController, const int fdWrite) :
   a_timeController(*timeController),
   a_fdWrite(fdWrite),
   a_expectedTime(0),
@@ -85,8 +57,8 @@ timex::TickProducer::TickProducer(timex::Engine* timeController, const int fdWri
   a_requestedStop(false)
 {;}
 
-void timex::TickProducer::tick()
-throw() {
+void anna::timex::TickProducer::tick()
+{
   static char onebyte = 0xff;
   static int errorCount = 0;
 
@@ -112,8 +84,8 @@ throw() {
 // (3) Si la correcin aplicada es mayor del 5% de la resolucin volvemos a calcularla ya
 //     que podemos considerar que normalmente no desviar�tanto tiempo.
 //--------------------------------------------------------------------------------------------
-Millisecond timex::TickProducer::calculeSlice(const Millisecond & msnow)
-throw() {
+Millisecond anna::timex::TickProducer::calculeSlice(const Millisecond & msnow)
+{
   Millisecond result(a_timeController.getResolution());
   int correction = (a_expectedTime == 0) ? 0 : (a_expectedTime - msnow);           // (2)