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/Slice/FileTracker.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/Slice/FileTracker.cpp')
| -rw-r--r-- | cpp/src/Slice/FileTracker.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/cpp/src/Slice/FileTracker.cpp b/cpp/src/Slice/FileTracker.cpp index 0c97b35f448..a14638757a2 100644 --- a/cpp/src/Slice/FileTracker.cpp +++ b/cpp/src/Slice/FileTracker.cpp @@ -40,11 +40,7 @@ Slice::FileException::ice_name() const void Slice::FileException::ice_print(ostream& out) const { -#if defined(_MSC_VER) && (_MSC_VER < 1300) - Exception::ice_print(out); -#else IceUtil::Exception::ice_print(out); -#endif out << ": " << _reason; } |