X-Git-Url: https://git.teslayout.com/public/public/public/?a=blobdiff_plain;f=source%2Fcore%2Futil%2FString.cpp;h=28381de351d704bb812760dbc0bafae01ac5bc28;hb=5a6cba5fde2b2f538a7515f8293cc0a8d9589dfa;hp=8f94116707a407e92035beb5d7e34152af25e6cd;hpb=93366a0bda79e6fd6e7dad6316bfcf8cc82f5731;p=anna.git diff --git a/source/core/util/String.cpp b/source/core/util/String.cpp index 8f94116..28381de 100644 --- a/source/core/util/String.cpp +++ b/source/core/util/String.cpp @@ -18,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+= (""); @@ -39,7 +39,7 @@ throw() { } String& String::operator<< (const int vv) -throw() { +{ char aux [16]; sprintf(aux, "%d", vv); string::operator+= (aux); @@ -47,7 +47,7 @@ throw() { } String& String::operator<< (const unsigned int vv) -throw() { +{ char aux [16]; sprintf(aux, "%u", vv); string::operator+= (aux); @@ -55,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); @@ -93,7 +89,7 @@ throw() { } String& String::operator<< (const double vv) -throw() { +{ char aux [64]; sprintf(aux, "%e", vv); string::operator+= (aux); @@ -101,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)); }