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/Ice/Proxy.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/Ice/Proxy.cpp')
| -rw-r--r-- | cpp/src/Ice/Proxy.cpp | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/cpp/src/Ice/Proxy.cpp b/cpp/src/Ice/Proxy.cpp index a1fe9f11909..f2e20d3ee50 100644 --- a/cpp/src/Ice/Proxy.cpp +++ b/cpp/src/Ice/Proxy.cpp @@ -47,14 +47,6 @@ const string ice_flushBatchRequests_name = "ice_flushBatchRequests"; ::Ice::ObjectPrx IceInternal::checkedCastImpl(const ObjectPrx& b, const string& f, const string& typeId, const Context* context) { -// -// COMPILERBUG: Without this work-around, release VC7.0 and VC7.1 -// build crash when FacetNotExistException is raised -// -#if defined(_MSC_VER) && (_MSC_VER >= 1300) && (_MSC_VER <= 1310) - ObjectPrx fooBar; -#endif - if(b) { ObjectPrx bb = b->ice_facet(f); |