merging javascript branch

1 files changed, 1 insertions, 49 deletions

diff --git a/cpp/src/Ice/ProtocolPluginFacade.cpp b/cpp/src/Ice/ProtocolPluginFacade.cpp
index e7ca3f5c2f9..1fb85821f18 100644
--- a/cpp/src/Ice/ProtocolPluginFacade.cpp
+++ b/cpp/src/Ice/ProtocolPluginFacade.cpp
@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2013 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
 //
 // This copy of Ice is licensed to you under the terms described in the
 // ICE_LICENSE file included in this distribution.
@@ -32,54 +32,6 @@ IceInternal::ProtocolPluginFacade::getCommunicator() const
     return _communicator;
 }
 
-string
-IceInternal::ProtocolPluginFacade::getDefaultHost() const
-{
-    return _instance->defaultsAndOverrides()->defaultHost;
-}
-
-Ice::EncodingVersion
-IceInternal::ProtocolPluginFacade::getDefaultEncoding() const
-{
-    return _instance->defaultsAndOverrides()->defaultEncoding;
-}
-
-int
-IceInternal::ProtocolPluginFacade::getNetworkTraceLevel() const
-{
-    return _instance->traceLevels()->network;
-}
-
-const char*
-IceInternal::ProtocolPluginFacade::getNetworkTraceCategory() const
-{
-    return _instance->traceLevels()->networkCat;
-}
-
-EndpointHostResolverPtr
-IceInternal::ProtocolPluginFacade::getEndpointHostResolver() const
-{
-    return _instance->endpointHostResolver();
-}
-
-ProtocolSupport
-IceInternal::ProtocolPluginFacade::getProtocolSupport() const
-{
-    return _instance->protocolSupport();
-}
-
-bool
-IceInternal::ProtocolPluginFacade::preferIPv6() const
-{
-    return _instance->preferIPv6();
-}
-
-NetworkProxyPtr
-IceInternal::ProtocolPluginFacade::getNetworkProxy() const
-{
-    return _instance->networkProxy();
-}
-
 void
 IceInternal::ProtocolPluginFacade::addEndpointFactory(const EndpointFactoryPtr& factory) const
 {