X-Git-Url: https://git.teslayout.com/public/public/public/?a=blobdiff_plain;f=include%2Fanna%2Fdiameter.comm%2FTimer.hpp;h=7857a5180565586faa0df50e2fcbfdbebd543b8e;hb=5a6cba5fde2b2f538a7515f8293cc0a8d9589dfa;hp=e9d233fbfdf1a9b379cfd4dbd1637f8bce6c93a7;hpb=39033fd99e58e994a5e98c1060dcc79e0d81f9c9;p=anna.git

diff --git a/include/anna/diameter.comm/Timer.hpp b/include/anna/diameter.comm/Timer.hpp
index e9d233f..7857a51 100644
--- a/include/anna/diameter.comm/Timer.hpp
+++ b/include/anna/diameter.comm/Timer.hpp
@@ -1,37 +1,9 @@
-// ANNA - Anna is Not Nothingness Anymore
-//
-// (c) Copyright 2005-2014 Eduardo Ramos Testillano & Francisco Ruiz Rayo
-//
-// http://redmine.teslayout.com/projects/anna-suite
-//
-// 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 the copyright holder 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 //
 
 
 #ifndef anna_diameter_comm_Timer_hpp
@@ -61,18 +33,18 @@ public:
   struct Type { enum _v { ResponseExpiration, SessionUnbind, SessionRecover, LocalServerAttach }; };
 
   // getters for responses
-  Response* getResponse() throw() { return reinterpret_cast <Response*>(getContext()); }
-  const Response* getResponse() const throw() { return reinterpret_cast <const Response*>(getContext()); }
+  Response* getResponse() { return reinterpret_cast <Response*>(getContext()); }
+  const Response* getResponse() const { return reinterpret_cast <const Response*>(getContext()); }
 
   // getters for session (client-session at the moment)
-  Session* getSession() throw() { return reinterpret_cast <Session*>(getContext()); }
-  const Session* getSession() const throw() { return reinterpret_cast <const Session*>(getContext()); }
+  Session* getSession() { return reinterpret_cast <Session*>(getContext()); }
+  const Session* getSession() const { return reinterpret_cast <const Session*>(getContext()); }
 
   // getters for local server
-  LocalServer* getLocalServer() throw() { return reinterpret_cast <LocalServer*>(getContext()); }
-  const LocalServer* getLocalServer() const throw() { return reinterpret_cast <const LocalServer*>(getContext()); }
+  LocalServer* getLocalServer() { return reinterpret_cast <LocalServer*>(getContext()); }
+  const LocalServer* getLocalServer() const { return reinterpret_cast <const LocalServer*>(getContext()); }
 
-  std::string asString() const throw();
+  std::string asString() const ;
 
 private:
   Timer() {;}
@@ -80,11 +52,11 @@ private:
 
   Type::_v a_type;
 
-  void expire(anna::timex::Engine*) throw(anna::RuntimeException);
+  void expire(anna::timex::Engine*) noexcept(false);
 
-  Type::_v getType() const throw() { return a_type; }
-  void setType(const Type::_v type)  throw() { a_type = type; }
-  static const char* asText(const Type::_v) throw();
+  Type::_v getType() const { return a_type; }
+  void setType(const Type::_v type)  { a_type = type; }
+  static const char* asText(const Type::_v) ;
 
 
   friend class TimerManager;