1 files changed, 16 insertions, 18 deletions
diff --git a/cpp/include/Ice/ProxyF.h b/cpp/include/Ice/ProxyF.h
index 9c4c4486bef..025ab41b044 100644
--- a/cpp/include/Ice/ProxyF.h
+++ b/cpp/include/Ice/ProxyF.h
@@ -13,46 +13,44 @@
 #include <Ice/Config.h>
 #include <Ice/ProxyHandle.h>
 
-#ifndef ICE_CPP11_MAPPING // C++98 mapping
-namespace IceProxy
-{
-
+#ifdef ICE_CPP11_MAPPING
 namespace Ice
 {
 
-class Object;
-inline Object* upCast(Object* o) { return o; }
-
-}
+class ObjectPrx;
+using ObjectPrxPtr = ::std::shared_ptr<ObjectPrx>;
 
 }
 
-namespace Ice
+namespace IceInternal
 {
 
-typedef IceInternal::ProxyHandle< ::IceProxy::Ice::Object> ObjectPrx;
-typedef ObjectPrx ObjectPrxPtr;
+template<typename P>
+::std::shared_ptr<P> createProxy();
 
 }
 
-#else // C++11 mapping
+#else // C++98 mapping
+namespace IceProxy
+{
 
 namespace Ice
 {
 
-class ObjectPrx;
-typedef ::std::shared_ptr<ObjectPrx> ObjectPrxPtr;
+class Object;
+inline Object* upCast(Object* o) { return o; }
 
 }
 
-namespace IceInternal
+}
+
+namespace Ice
 {
 
-template<typename P>
-::std::shared_ptr<P> createProxy();
+typedef IceInternal::ProxyHandle< ::IceProxy::Ice::Object> ObjectPrx;
+typedef ObjectPrx ObjectPrxPtr;
 
 }
 
 #endif
-
 #endif