diff options
| author | Jose <jose@zeroc.com> | 2012-08-10 01:19:57 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2012-08-10 01:19:57 +0200 |
| commit | d566c39e025bdfe4d38e63083a4ccc0122c8067f (patch) | |
| tree | ffe98d32acf2bd1b87e856c4a9437e41ae7856b4 /cpp/src/IceSSL/EndpointI.cpp | |
| parent | Minor fixes to Scanner generated files to just include ScannerConfig.h. (diff) | |
| download | ice-d566c39e025bdfe4d38e63083a4ccc0122c8067f.tar.bz2 ice-d566c39e025bdfe4d38e63083a4ccc0122c8067f.tar.xz ice-d566c39e025bdfe4d38e63083a4ccc0122c8067f.zip | |
Remove some more VC6 compiler fixes
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 4d389371d42..a9eb8e707d8 100644 --- a/cpp/src/IceSSL/EndpointI.cpp +++ b/cpp/src/IceSSL/EndpointI.cpp @@ -271,11 +271,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 { @@ -304,11 +301,6 @@ namespace return true; } }; -} - -Ice::EndpointInfoPtr -IceSSL::EndpointI::getInfo() const -{ return new InfoI(_protocol, _encoding, _timeout, _compress, _host, _port); } |