diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2012-08-10 09:52:43 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2012-08-10 09:52:43 +0200 |
| commit | ddda52695c8647afa8bf833c1e1424df0e799279 (patch) | |
| tree | 43a16df66a37ad1467519553757e7627b72af996 /cpp/src/FreezeScript/Data.cpp | |
| parent | GCC fixes (diff) | |
| parent | Remove some more VC6 compiler fixes (diff) | |
| download | ice-ddda52695c8647afa8bf833c1e1424df0e799279.tar.bz2 ice-ddda52695c8647afa8bf833c1e1424df0e799279.tar.xz ice-ddda52695c8647afa8bf833c1e1424df0e799279.zip | |
Merge remote-tracking branch 'origin/encoding11' into mx
Conflicts:
cpp/src/Ice/OutgoingAsync.cpp
Diffstat (limited to 'cpp/src/FreezeScript/Data.cpp')
| -rw-r--r-- | cpp/src/FreezeScript/Data.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/cpp/src/FreezeScript/Data.cpp b/cpp/src/FreezeScript/Data.cpp index 5380f74110f..c92d9c2088b 100644 --- a/cpp/src/FreezeScript/Data.cpp +++ b/cpp/src/FreezeScript/Data.cpp @@ -839,11 +839,7 @@ FreezeScript::IntegerData::toString(Ice::Long value) { char buf[64]; #ifdef _WIN32 -#if defined(_MSC_VER) && (_MSC_VER >= 1400) sprintf_s(buf, "%I64d", value); -#else - sprintf(buf, "%I64d", value); -#endif #elif defined(ICE_64) sprintf(buf, "%ld", value); #else |