2 files changed, 12 insertions, 2 deletions
diff --git a/cpp/include/Ice/ProxyHandle.h b/cpp/include/Ice/ProxyHandle.h
index 5578b9ff788..205471af7ee 100644
--- a/cpp/include/Ice/ProxyHandle.h
+++ b/cpp/include/Ice/ProxyHandle.h
@@ -314,12 +314,12 @@ public:
     }
 };
 
-}
-
 template<class Y>
 std::ostream& operator<<(std::ostream& os, ::IceInternal::ProxyHandle<Y> p)
 {
     return os << (p ? p->ice_toString() : std::string(""));
 }
 
+}
+
 #endif
diff --git a/cpp/src/Ice/Proxy.cpp b/cpp/src/Ice/Proxy.cpp
index 05dbdc32ab5..58abfc6472c 100644
--- a/cpp/src/Ice/Proxy.cpp
+++ b/cpp/src/Ice/Proxy.cpp
@@ -1435,12 +1435,22 @@ IceProxy::Ice::Object::__end(const ::Ice::AsyncResultPtr& __result, const std::s
     }
 }
 
+namespace IceProxy
+{
+
+namespace Ice
+{
+
 ostream&
 operator<<(ostream& os, const ::IceProxy::Ice::Object& p)
 {
     return os << p.ice_toString();
 }
 
+}
+
+}
+
 Handle< ::IceDelegate::Ice::Object>
 IceProxy::Ice::Object::__getDelegate(bool ami)
 {