X-Git-Url: https://git.teslayout.com/public/public/public/?a=blobdiff_plain;f=source%2Fcore%2Futil%2FString.cpp;h=28381de351d704bb812760dbc0bafae01ac5bc28;hb=5a6cba5fde2b2f538a7515f8293cc0a8d9589dfa;hp=bb8b6ef968b99fcdb6bf4dad72a8f8704874543e;hpb=3e258840b15577cb8bda3cdedd0b9b88e16404b3;p=anna.git

diff --git a/source/core/util/String.cpp b/source/core/util/String.cpp
index bb8b6ef..28381de 100644
--- a/source/core/util/String.cpp
+++ b/source/core/util/String.cpp
@@ -1,37 +1,9 @@
-// ANNA - Anna is Not Nothingness 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 //
 
 
 #include <cctype> // for toupper
@@ -46,17 +18,17 @@ using namespace std;
 using namespace anna;
 
 void String::toUpper()
-throw() {
+{
   std::transform(begin(), end(), begin(), (int(*)(int)) toupper);
 }
 
 void String::toLower()
-throw() {
+{
   std::transform(begin(), end(), begin(), (int(*)(int)) tolower);
 }
 
 String& String::operator<< (const char* vv)
-throw() {
+{
   if(vv == NULL) {
     if(a_flags & Flag::ShowNull)
       string::operator+= ("<null>");
@@ -67,7 +39,7 @@ throw() {
 }
 
 String& String::operator<< (const int vv)
-throw() {
+{
   char aux [16];
   sprintf(aux, "%d", vv);
   string::operator+= (aux);
@@ -75,7 +47,7 @@ throw() {
 }
 
 String& String::operator<< (const unsigned int vv)
-throw() {
+{
   char aux [16];
   sprintf(aux, "%u", vv);
   string::operator+= (aux);
@@ -83,37 +55,33 @@ throw() {
 }
 
 String& String::operator<< (const S64 vv)
-throw() {
+{
   char aux [32];
-  sprintf(aux, "%lld", vv);
-  /*
+  //sprintf(aux, "%lld", vv);
   #ifdef __anna64__
-     sprintf (aux, "%ld", vv);
+    sprintf (aux, "%ld", vv);
   #else
-     sprintf (aux, "%lld", vv);
+    sprintf (aux, "%lld", vv);
   #endif
-  */
   string::operator+= (aux);
   return *this;
 }
 
 String& String::operator<< (const U64 vv)
-throw() {
+{
   char aux [32];
-  sprintf(aux, "%llu", vv);
-  /*
-   #ifdef __anna64__
-      sprintf (aux, "%lu", vv);
-   #else
-      sprintf (aux, "%llu", vv);
-   #endif
-  */
+  //sprintf(aux, "%llu", vv);
+  #ifdef __anna64__
+    sprintf (aux, "%lu", vv);
+  #else
+    sprintf (aux, "%llu", vv);
+  #endif
   string::operator+= (aux);
   return *this;
 }
 
 String& String::operator<< (const float vv)
-throw() {
+{
   char aux [64];
   sprintf(aux, "%f", vv);
   string::operator+= (aux);
@@ -121,7 +89,7 @@ throw() {
 }
 
 String& String::operator<< (const double vv)
-throw() {
+{
   char aux [64];
   sprintf(aux, "%e", vv);
   string::operator+= (aux);
@@ -129,12 +97,12 @@ throw() {
 }
 
 String& String::operator<< (const DataBlock& vv)
-throw() {
+{
   return *this += vv.asString();
 }
 
 //static
 String String::format(const DataBlock& vv, const int characterByLine)
-throw() {
+{
   return String(vv.asString(characterByLine));
 }