bug 2264 - remove deprecated APIs

4 files changed, 0 insertions, 41 deletions

diff --git a/cpp/include/Ice/Application.h b/cpp/include/Ice/Application.h
index a73a5b2853c..39d1722c969 100644
--- a/cpp/include/Ice/Application.h
+++ b/cpp/include/Ice/Application.h
@@ -35,7 +35,6 @@ public:
     int main(int, char*[]);
     int main(int, char*[], const char*);
     int main(int, char*[], const Ice::InitializationData&);
-    ICE_DEPRECATED_API int main(int, char*[], const char*, const Ice::LoggerPtr&);
     int main(const StringSeq&);
     int main(const StringSeq&, const char*);
     int main(const StringSeq&, const Ice::InitializationData&);
diff --git a/cpp/include/Ice/IdentityUtil.h b/cpp/include/Ice/IdentityUtil.h
deleted file mode 100644
index e74f726319d..00000000000
--- a/cpp/include/Ice/IdentityUtil.h
+++ /dev/null
@@ -1,23 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2008 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.
-//
-// **********************************************************************
-
-#ifndef ICE_IDENTITY_UTIL_H
-#define ICE_IDENTITY_UTIL_H
-
-#include <Ice/Identity.h>
-
-namespace Ice
-{
-
-ICE_API ICE_DEPRECATED_API Identity stringToIdentity(const std::string&);
-ICE_API ICE_DEPRECATED_API std::string identityToString(const Identity&);
-
-}
-
-#endif
diff --git a/cpp/include/Ice/Initialize.h b/cpp/include/Ice/Initialize.h
index e9bbc4ff617..972ed72c4dd 100644
--- a/cpp/include/Ice/Initialize.h
+++ b/cpp/include/Ice/Initialize.h
@@ -74,14 +74,6 @@ ICE_API CommunicatorPtr initialize(const InitializationData& = InitializationDat
                                    Int = ICE_INT_VERSION);
 
 
-ICE_API ICE_DEPRECATED_API CommunicatorPtr initializeWithProperties(int&, char*[], const PropertiesPtr&,
-                                                                    Int = ICE_INT_VERSION);
-ICE_API ICE_DEPRECATED_API CommunicatorPtr initializeWithLogger(int&, char*[], const Ice::LoggerPtr&,
-                                                                Int = ICE_INT_VERSION);
-ICE_API ICE_DEPRECATED_API CommunicatorPtr initializeWithPropertiesAndLogger(int&, char*[], const PropertiesPtr&,
-                                                                             const Ice::LoggerPtr&, 
-                                                                             Int = ICE_INT_VERSION);
-
 ICE_API InputStreamPtr createInputStream(const CommunicatorPtr&, const ::std::vector< Byte >&);
 ICE_API InputStreamPtr createInputStream(const CommunicatorPtr&,
                                          const ::std::pair< const Ice::Byte*, const Ice::Byte*>&);
diff --git a/cpp/include/Ice/Proxy.h b/cpp/include/Ice/Proxy.h
index 4bdbddf070b..41b6007bc6d 100644
--- a/cpp/include/Ice/Proxy.h
+++ b/cpp/include/Ice/Proxy.h
@@ -81,10 +81,8 @@ public:
     bool operator!=(const Object&) const;
     bool operator<(const Object&) const;
 
-    ICE_DEPRECATED_API ::Ice::Int ice_hash() const;
     ::Ice::Int ice_getHash() const;
 
-    ICE_DEPRECATED_API ::Ice::CommunicatorPtr ice_communicator() const;
     ::Ice::CommunicatorPtr ice_getCommunicator() const;
 
     ::std::string ice_toString() const;
@@ -169,24 +167,19 @@ public:
                           const ::std::pair<const ::Ice::Byte*, const ::Ice::Byte*>&, const ::Ice::Context&);
 
     ::Ice::Identity ice_getIdentity() const;
-    ICE_DEPRECATED_API ::Ice::ObjectPrx ice_newIdentity(const ::Ice::Identity&) const;
     ::Ice::ObjectPrx ice_identity(const ::Ice::Identity&) const;
 
     ::Ice::Context ice_getContext() const;
-    ICE_DEPRECATED_API ::Ice::ObjectPrx ice_newContext(const ::Ice::Context&) const;
     ::Ice::ObjectPrx ice_context(const ::Ice::Context&) const;
     ICE_DEPRECATED_API ::Ice::ObjectPrx ice_defaultContext() const;
 
     const ::std::string& ice_getFacet() const;
-    ICE_DEPRECATED_API ::Ice::ObjectPrx ice_newFacet(const ::std::string&) const;
     ::Ice::ObjectPrx ice_facet(const ::std::string&) const;
 
     ::std::string ice_getAdapterId() const;
-    ICE_DEPRECATED_API ::Ice::ObjectPrx ice_newAdapterId(const ::std::string&) const;
     ::Ice::ObjectPrx ice_adapterId(const ::std::string&) const;
 
     ::Ice::EndpointSeq ice_getEndpoints() const;
-    ICE_DEPRECATED_API ::Ice::ObjectPrx ice_newEndpoints(const ::Ice::EndpointSeq&) const;
     ::Ice::ObjectPrx ice_endpoints(const ::Ice::EndpointSeq&) const;
 
     ::Ice::Int ice_getLocatorCacheTimeout() const;
@@ -211,7 +204,6 @@ public:
     ::Ice::ObjectPrx ice_locator(const ::Ice::LocatorPrx&) const;
 
     bool ice_isCollocationOptimized() const;
-    ICE_DEPRECATED_API ::Ice::ObjectPrx ice_collocationOptimization(bool) const;
     ::Ice::ObjectPrx ice_collocationOptimized(bool) const;
 
     ::Ice::ObjectPrx ice_twoway() const;
@@ -232,7 +224,6 @@ public:
     bool ice_isThreadPerConnection() const;
     ::Ice::ObjectPrx ice_threadPerConnection(bool) const;
 
-    ICE_DEPRECATED_API ::Ice::ConnectionPtr ice_connection();
     ::Ice::ConnectionPtr ice_getConnection();
     ::Ice::ConnectionPtr ice_getCachedConnection() const;