X-Git-Url: https://git.teslayout.com/public/public/public/?a=blobdiff_plain;f=include%2Fanna%2Fcomm%2Finternal%2FPoll.hpp;h=9670cbea60286230eaa148c35a4e34c8cf2baa4c;hb=5a6cba5fde2b2f538a7515f8293cc0a8d9589dfa;hp=6ef2523c773be8fe0cc451b793e8e78377323195;hpb=39033fd99e58e994a5e98c1060dcc79e0d81f9c9;p=anna.git

diff --git a/include/anna/comm/internal/Poll.hpp b/include/anna/comm/internal/Poll.hpp
index 6ef2523..9670cbe 100644
--- a/include/anna/comm/internal/Poll.hpp
+++ b/include/anna/comm/internal/Poll.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_comm_internal_Poll_hpp
@@ -58,32 +30,32 @@ namespace comm {
 */
 class Poll {
 public:
-  Poll() : a_maxfd(0), a_ptrTimeout(NULL), a_minfd(INT_MAX) {
+  Poll() : a_ptrTimeout(NULL), a_minfd(INT_MAX), a_maxfd(0) {
     FD_ZERO(&a_fdmask);
     FD_ZERO(&a_fdset);
   }
 
-  void setTimeout(const Millisecond &timeout) throw();
+  void setTimeout(const Millisecond &timeout) ;
 
-  void waitMessage() throw(RuntimeException);
-  int fetch() throw();
-  bool isEmpty() const throw() { return a_pollr <= 0; }
-  void clear() throw() { a_maxfd = 0; a_minfd = INT_MAX; FD_ZERO(&a_fdmask); FD_ZERO(&a_fdset);}
-  void insert(const int fd) throw();
-  void erase(const int fd) throw();
+  void waitMessage() noexcept(false);
+  int fetch() ;
+  bool isEmpty() const { return a_pollr <= 0; }
+  void clear() { a_maxfd = 0; a_minfd = INT_MAX; FD_ZERO(&a_fdmask); FD_ZERO(&a_fdset);}
+  void insert(const int fd) ;
+  void erase(const int fd) ;
 
 private:
   fd_set a_fdmask;
   fd_set a_fdset;
+  timeval* a_ptrTimeout;
   int a_minfd;
   int a_maxfd;
   int a_pollr;
   int a_ifd;
   timeval a_timeout;
-  timeval* a_ptrTimeout;
 
   static int select(const int maxfd, fd_set* fdset, timeval* timeout)
-  throw(RuntimeException) {
+  noexcept(false) {
     int result;
 
     do {
@@ -98,7 +70,7 @@ private:
     return result;
   }
 
-  static int min(const Millisecond &n1, const Millisecond &n2) throw() { return (n1 < n2) ? n1 : n2; }
+  static int min(const Millisecond &n1, const Millisecond &n2) { return (n1 < n2) ? n1 : n2; }
 };
 
 }