X-Git-Url: https://git.teslayout.com/public/public/public/?a=blobdiff_plain;f=include%2Fanna%2Fcomm%2FReceiverFactory.hpp;h=68bf460c4d15606028c507fb948585700be873a6;hb=5a6cba5fde2b2f538a7515f8293cc0a8d9589dfa;hp=712a09a62f2a9018687f0527acaaacc4ad695458;hpb=dcdc516f254a8985424e319cd9ae0ee061e58fb0;p=anna.git

diff --git a/include/anna/comm/ReceiverFactory.hpp b/include/anna/comm/ReceiverFactory.hpp
index 712a09a..68bf460 100644
--- a/include/anna/comm/ReceiverFactory.hpp
+++ b/include/anna/comm/ReceiverFactory.hpp
@@ -1,37 +1,9 @@
-// ANNA - Anna is Not 'N' 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 //
 
 
 #ifndef anna_comm_ReceiverFactory_hpp
@@ -67,8 +39,8 @@ class Receiver;
    private:
       anna::Recycler<MyReceiver> a_receivers;
 
-      Receiver* do_create () throw () { return a_receivers.create (); }
-      void do_release (Receiver* receiver) throw () { a_receivers.release (static_cast <MyReceiver*> (receiver)); }
+      Receiver* do_create () { return a_receivers.create (); }
+      void do_release (Receiver* receiver) { a_receivers.release (static_cast <MyReceiver*> (receiver)); }
    };
 
    \endcode
@@ -84,7 +56,7 @@ public:
      Returns the logical name for this receiver factory.
      @return logical name for this receiver factory.
   */
-  const std::string& getName() const throw() { return a_name; }
+  const std::string& getName() const { return a_name; }
 
   /**
      Creates a receiver instance for this factory. Reuse resources when needed.
@@ -92,7 +64,7 @@ public:
      \return The new receiver instance.
      \warning All the receivers obtained shall be released by mean #release.
   */
-  Receiver* create() throw(RuntimeException);
+  Receiver* create() noexcept(false);
 
   /**
      Release the receiver instance provided.
@@ -100,14 +72,14 @@ public:
      \return The receiver instance to be released.
      \warning The parameter should have been obtained by mean #create.
   */
-  void release(Receiver* receiver) throw();
+  void release(Receiver* receiver) ;
 
   /**
      Returns a string with relevant information for this instance.
      @return string with relevant information for this instance.
   */
   std::string asString() const
-  throw() {
+  {
     std::string msg("anna::comm::ReceiverFactory { Name: ");
     msg += a_name;
     return msg += " }";
@@ -118,7 +90,7 @@ public:
      \param parent XML node from which created data will depend on.
      @return a XML document with relevant information for this instance.
   */
-  xml::Node* asXML(xml::Node* parent) const throw();
+  xml::Node* asXML(xml::Node* parent) const ;
 
 protected:
   /**
@@ -134,7 +106,7 @@ protected:
      \return The new receiver instance.
      \warning All the receivers obtained shall be released by mean #release.
   */
-  virtual Receiver* do_create() throw() = 0;
+  virtual Receiver* do_create()  = 0;
 
   /**
      Release the receiver provided. This method is called from a critical section activated
@@ -142,7 +114,7 @@ protected:
 
      \param The receiver instance to be released.
   */
-  virtual void do_release(Receiver* receiver) throw() = 0;
+  virtual void do_release(Receiver* receiver)  = 0;
 
 private:
   const std::string a_name;