diff options
| author | Jose <jose@zeroc.com> | 2012-03-08 20:42:54 +0100 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2012-03-08 20:42:54 +0100 |
| commit | bc297cd60c7181539a9120134a2fa76b955ef8aa (patch) | |
| tree | 979673b686247a0e8ed554ec7e8bb41201f964a7 /cpp/src | |
| parent | serialVersionUID fixes (diff) | |
| download | ice-bc297cd60c7181539a9120134a2fa76b955ef8aa.tar.bz2 ice-bc297cd60c7181539a9120134a2fa76b955ef8aa.tar.xz ice-bc297cd60c7181539a9120134a2fa76b955ef8aa.zip | |
serialVersionUID fix to use IceUtilInternal::stringToInt64 for numeric conversions
Diffstat (limited to 'cpp/src')
| -rw-r--r-- | cpp/src/slice2java/Gen.cpp | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/cpp/src/slice2java/Gen.cpp b/cpp/src/slice2java/Gen.cpp index da0e8832a16..94dbfc72e85 100644 --- a/cpp/src/slice2java/Gen.cpp +++ b/cpp/src/slice2java/Gen.cpp @@ -14,6 +14,7 @@ #include <IceUtil/Functional.h> #include <IceUtil/Iterator.h> #include <IceUtil/StringUtil.h> +#include <IceUtil/InputUtil.h> #include <cstring> #include <limits> @@ -2585,12 +2586,7 @@ Slice::Gen::TypesVisitor::visitClassDefEnd(const ClassDefPtr& p) serialVersionUID = serialVersionUID.substr(pos); if(serialVersionUID != "0") { -#ifdef WIN32 - v = _atoi64(serialVersionUID.c_str()); -#else - v = atoll(serialVersionUID.c_str()); -#endif - if(v == 0) // conversion error + if(!IceUtilInternal::stringToInt64(serialVersionUID, v)) // conversion error { ostringstream os; os << "ignoring invalid serialVersionUID for class `" << p->scoped() << "'; generating default value"; @@ -3367,12 +3363,7 @@ Slice::Gen::TypesVisitor::visitStructEnd(const StructPtr& p) serialVersionUID = serialVersionUID.substr(pos); if(serialVersionUID != "0") { -#ifdef WIN32 - v = _atoi64(serialVersionUID.c_str()); -#else - v = atoll(serialVersionUID.c_str()); -#endif - if(v == 0) // conversion error + if(!IceUtilInternal::stringToInt64(serialVersionUID, v)) // conversion error { ostringstream os; os << "ignoring invalid serialVersionUID for struct `" << p->scoped() << "'; generating default value"; |