X-Git-Url: https://git.teslayout.com/public/public/public/?a=blobdiff_plain;f=include%2Fanna%2Fcore%2Fdefine.autoenum.hpp;h=a05c120812a3ec719084a53f635384f2e70f2561;hb=5a6cba5fde2b2f538a7515f8293cc0a8d9589dfa;hp=ebc404ceca235bd71d796e461abe70cf882abb0a;hpb=39033fd99e58e994a5e98c1060dcc79e0d81f9c9;p=anna.git

diff --git a/include/anna/core/define.autoenum.hpp b/include/anna/core/define.autoenum.hpp
index ebc404c..a05c120 100644
--- a/include/anna/core/define.autoenum.hpp
+++ b/include/anna/core/define.autoenum.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_core_define_autoenum_hpp
@@ -75,14 +47,19 @@
  */
 #define anna_declare_enum(name) \
    static const char* literal []; \
-   static _v asEnum (const char* str) throw () { \
+   static int calculateSize () { \
+      int ii = 0; \
+      while (literal [ii] != NULL) ii ++; \
+      return ii; \
+   } \
+   static _v asEnum (const char* str) { \
       for (int ii = 0; literal [ii] != NULL; ii ++) { \
          if (strcasecmp (str, literal [ii]) == 0) \
             return (_v) ii; \
       } \
       return None; \
    } \
-   static _v asEnumEx (const char* str) throw (anna::RuntimeException) { \
+   static _v asEnumEx (const char* str) noexcept(false) { \
       if (str == NULL) { \
          std::string msg (#name); \
          msg += "::asEnumEx | str can not be null"; \
@@ -99,13 +76,13 @@
       } \
       return result; \
    } \
-   static _v asEnum (const std::string& str) throw () { return asEnum (str.c_str ()); } \
-   static _v asEnumEx (const std::string& str) throw (anna::RuntimeException) { return asEnumEx (str.c_str ()); } \
-   static const char* asCString (const _v v) throw () { return (v != None) ? literal [v]: NULL; } \
-   static const char* asNotNullCString (const _v v) throw () { return (v != None) ? literal [v]: "<none>"; } \
-   static std::string asList () throw () {\
+   static _v asEnum (const std::string& str) { return asEnum (str.c_str ()); } \
+   static _v asEnumEx (const std::string& str) noexcept(false) { return asEnumEx (str.c_str ()); } \
+   static const char* asCString (const _v v) { return (v != None) ? literal [v]: NULL; } \
+   static const char* asNotNullCString (const _v v) { return (v != None) ? literal [v]: "<none>"; } \
+   static std::string asList () {\
       std::string result;\
-      for (register int ii = 0; literal [ii] != NULL; ii ++) { \
+      for (int ii = 0; literal [ii] != NULL; ii ++) { \
          if (ii == 0 && strcmp (literal [ii], "None") == 0) continue; \
          if (ii > 1) result += ' '; \
          result += "'"; result += literal [ii]; result += "'"; \