X-Git-Url: https://git.teslayout.com/public/public/public/?a=blobdiff_plain;f=include%2Fanna%2Fcore%2Futil%2FSortedVector.hpp;h=4e4bf53d5d2b7202ec45474cfcbb13f6bc5fb45a;hb=5a6cba5fde2b2f538a7515f8293cc0a8d9589dfa;hp=5c3b0d6800bcd78bcc90922b5166aa54de3b6d7c;hpb=4e12ac57e93c052f716a6305ad8fc099c45899d1;p=anna.git

diff --git a/include/anna/core/util/SortedVector.hpp b/include/anna/core/util/SortedVector.hpp
index 5c3b0d6..4e4bf53 100644
--- a/include/anna/core/util/SortedVector.hpp
+++ b/include/anna/core/util/SortedVector.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_core_util_SortedVector_hpp
@@ -87,7 +59,7 @@ public:
      map o \em en otro caso.
   */
   bool contains(const T* t) const
-  throw() {
+  {
     if(t == NULL)
       return false;
 
@@ -101,7 +73,7 @@ public:
      \return \em true si ha registrado la nueva instancia o \em false en otro caso.
   */
   bool add(T* t)
-  throw(RuntimeException) {
+  noexcept(false) {
     if(t == NULL)
       return false;
 
@@ -117,7 +89,7 @@ public:
      \return \em true si ha eliminado la instancia o \em false en otro caso.
   */
   bool erase(T* t)
-  throw(RuntimeException) {
+  noexcept(false) {
     if(t == NULL)
       return false;
 
@@ -139,7 +111,7 @@ public:
      \return la instancia asociada a la clave recibida como parametro o NULL si no existe.
   */
   T* find(const TKey key)
-  throw() {
+  {
     iterator ii = container::find(key);
     return (ii == container::end()) ? NULL : ii->second;
   }
@@ -149,7 +121,7 @@ public:
      \param key Clave a buscar en el map.
      \return la instancia asociada a la clave recibida como parametro o NULL si no existe.
   */
-  const T* find(const TKey key) const throw() {
+  const T* find(const TKey key) const {
     return const_cast <SortedVector <T, SortBy, TKey>*>(this)->find(key);
   }
 
@@ -157,13 +129,13 @@ public:
      Devuelve el objeto referenciado por el iterador.
      \return El objeto referenciado por el iterador.
   */
-  static T* data(iterator ii) throw() { return ii->second; }
+  static T* data(iterator ii) { return ii->second; }
 
   /**
      Devuelve el objeto referenciado por el iterador.
      \return El objeto referenciado por el iterador.
   */
-  static const T* data(const_iterator ii) throw() { return ii->second; }
+  static const T* data(const_iterator ii) { return ii->second; }
 };
 
 }