Remove f ice (#1686)

cpp/include/Ice/LocatorF.h

@@ -0,0 +1,78 @@
+//
+// Copyright (c) ZeroC, Inc. All rights reserved.
+//
+
+#ifndef ICE_LOCATOR_F_H
+#define ICE_LOCATOR_F_H
+
+// TODO: remove this include when we remove the C++98 mapping.
+#include <IceUtil/PushDisableWarnings.h>
+
+#include "Config.h"
+#include <memory>
+#include "ProxyF.h"
+#include "SharedPtr.h"
+
+#ifdef ICE_CPP11_MAPPING // C++11 mapping
+
+namespace Ice
+{
+
+class Locator;
+class LocatorPrx;
+class LocatorRegistry;
+class LocatorRegistryPrx;
+
+using LocatorPtr = ::std::shared_ptr<Locator>;
+using LocatorPrxPtr = ::std::shared_ptr<LocatorPrx>;
+
+using LocatorRegistryPtr = ::std::shared_ptr<LocatorRegistry>;
+using LocatorRegistryPrxPtr = ::std::shared_ptr<LocatorRegistryPrx>;
+
+}
+
+#else // C++98 mapping
+
+namespace Ice
+{
+    class InputStream;
+}
+
+namespace IceProxy::Ice
+{
+
+class Locator;
+/// \cond INTERNAL
+ICE_API void _readProxy(::Ice::InputStream*, ::IceInternal::ProxyHandle< Locator>&);
+ICE_API ::IceProxy::Ice::Object* upCast(Locator*);
+/// \endcond
+
+class LocatorRegistry;
+/// \cond INTERNAL
+ICE_API void _readProxy(::Ice::InputStream*, ::IceInternal::ProxyHandle< LocatorRegistry>&);
+ICE_API ::IceProxy::Ice::Object* upCast(LocatorRegistry*);
+/// \endcond
+
+}
+
+namespace Ice
+{
+
+typedef ::IceInternal::ProxyHandle< ::IceProxy::Ice::Locator> LocatorPrx;
+typedef LocatorPrx LocatorPrxPtr;
+
+class Locator;
+using LocatorPtr = ::Ice::SharedPtr< Locator>;
+typedef ::IceInternal::ProxyHandle< ::IceProxy::Ice::LocatorRegistry> LocatorRegistryPrx;
+typedef LocatorRegistryPrx LocatorRegistryPrxPtr;
+
+class LocatorRegistry;
+using LocatorRegistryPtr = ::Ice::SharedPtr< LocatorRegistry>;
+
+}
+
+#endif
+
+// TODO: remove this include when we remove the C++98 mapping.
+#include <IceUtil/PopDisableWarnings.h>
+#endif

cpp/include/Ice/ObjectAdapter.h

@@ -8,9 +8,11 @@
 #include "Config.h"
 #include "CommunicatorF.h"
 #include "Ice/LocatorF.h"
+#include "Endpoint.h"
 #include "FacetMap.h"
 #include "SharedPtr.h"
 #include "ServantLocator.h"
+#include "Proxy.h"
 
 namespace Ice
 {

cpp/include/Ice/Proxy.h

@@ -18,8 +18,8 @@
 #include <Ice/ReferenceF.h>
 #include <Ice/BatchRequestQueueF.h>
 #include <Ice/AsyncResult.h>
-//#include <Ice/RouterF.h> // Can't include RouterF.h here, otherwise we have cyclic includes
-//#include <Ice/LocatorF.h> // Can't include LocatorF.h here, otherwise we have cyclic includes
+#include <Ice/RouterF.h>
+#include <Ice/LocatorF.h>
 #include <Ice/Current.h>
 #include <Ice/CommunicatorF.h>
 #include <Ice/OutgoingAsync.h>
@@ -268,16 +268,6 @@ class ProxyFlushBatchPromise : public ProxyFlushBatchAsync, public PromiseInvoke
 namespace Ice
 {
 
-class RouterPrx;
-/// \cond INTERNAL
-using RouterPrxPtr = ::std::shared_ptr<::Ice::RouterPrx>;
-/// \endcond
-
-class LocatorPrx;
-/// \cond INTERNAL
-using LocatorPrxPtr = ::std::shared_ptr<::Ice::LocatorPrx>;
-/// \endcond
-
 class LocalException;
 class OutputStream;
 
@@ -1596,32 +1586,9 @@ checkedCast(const ::std::shared_ptr<T>& b, const std::string& f, const ::Ice::Co
 
 #else // C++98 mapping
 
-namespace IceProxy
-{
-
-namespace Ice
-{
-
-/// \cond INTERNAL
-class Locator;
-ICE_API ::IceProxy::Ice::Object* upCast(::IceProxy::Ice::Locator*);
-
-class Router;
-ICE_API ::IceProxy::Ice::Object* upCast(::IceProxy::Ice::Router*);
-/// \endcond
-
-}
-
-}
-
 namespace Ice
 {
 
-typedef ::IceInternal::ProxyHandle< ::IceProxy::Ice::Router> RouterPrx;
-typedef RouterPrx RouterPrxPtr;
-typedef ::IceInternal::ProxyHandle< ::IceProxy::Ice::Locator> LocatorPrx;
-typedef LocatorPrx LocatorPrxPtr;
-
 class LocalException;
 class OutputStream;
 

cpp/include/Ice/RouterF.h

@@ -0,0 +1,61 @@
+//
+// Copyright (c) ZeroC, Inc. All rights reserved.
+//
+
+#ifndef ICE_ROUTER_F_H
+#define ICE_ROUTER_F_H
+
+// TODO: remove this include when we remove the C++98 mapping.
+#include <IceUtil/PushDisableWarnings.h>
+
+#include "Config.h"
+#include <memory>
+#include "ProxyF.h"
+#include "SharedPtr.h"
+
+#ifdef ICE_CPP11_MAPPING // C++11 mapping
+
+namespace Ice
+{
+
+class Router;
+class RouterPrx;
+
+using RouterPtr = ::std::shared_ptr<Router>;
+using RouterPrxPtr = ::std::shared_ptr<RouterPrx>;
+
+}
+
+#else // C++98 mapping
+
+namespace Ice
+{
+    class InputStream;
+}
+
+namespace IceProxy::Ice
+{
+
+class Router;
+/// \cond INTERNAL
+ICE_API void _readProxy(::Ice::InputStream*, ::IceInternal::ProxyHandle< Router>&);
+ICE_API ::IceProxy::Ice::Object* upCast(Router*);
+/// \endcond
+
+}
+
+namespace Ice
+{
+typedef ::IceInternal::ProxyHandle< ::IceProxy::Ice::Router> RouterPrx;
+typedef RouterPrx RouterPrxPtr;
+
+class Router;
+using RouterPtr = ::Ice::SharedPtr< Router>;
+
+}
+
+#endif
+
+// TODO: remove this include when we remove the C++98 mapping.
+#include <IceUtil/PopDisableWarnings.h>
+#endif