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/IceSSL/EndpointI.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/IceSSL/EndpointI.cpp')
| -rw-r--r-- | cpp/src/IceSSL/EndpointI.cpp | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/cpp/src/IceSSL/EndpointI.cpp b/cpp/src/IceSSL/EndpointI.cpp index 377a1af4013..d7a63a226ee 100644 --- a/cpp/src/IceSSL/EndpointI.cpp +++ b/cpp/src/IceSSL/EndpointI.cpp @@ -270,11 +270,8 @@ IceSSL::EndpointI::toString() const return s.str(); } -// -// COMPILERFIX: VC6 complains about an ambiguous "EndpointInfo" symbol when this class is defined inside -// getInfo(). Moving the definition into an anonymous namespace works around it. -// -namespace +Ice::EndpointInfoPtr +IceSSL::EndpointI::getInfo() const { class InfoI : public IceSSL::EndpointInfo { @@ -303,11 +300,6 @@ namespace return true; } }; -} - -Ice::EndpointInfoPtr -IceSSL::EndpointI::getInfo() const -{ return new InfoI(_protocol, _encoding, _timeout, _compress, _host, _port); } |