6 files changed, 15 insertions, 11 deletions
diff --git a/cpp/include/Ice/FactoryTableDef.h b/cpp/include/Ice/FactoryTableDef.h
index 68287a10237..5f78ce3b3e0 100644
--- a/cpp/include/Ice/FactoryTableDef.h
+++ b/cpp/include/Ice/FactoryTableDef.h
@@ -45,7 +45,7 @@ private:
     OFTable _oft;
 };
 
-class ICE_API FactoryTableWrapper : IceUtil::noncopyable
+class ICE_API FactoryTableWrapper : public IceUtil::noncopyable
 {
 public:
 
diff --git a/cpp/include/Ice/LoggerUtil.h b/cpp/include/Ice/LoggerUtil.h
index 5b22e84ad70..2b1c2c42ec1 100644
--- a/cpp/include/Ice/LoggerUtil.h
+++ b/cpp/include/Ice/LoggerUtil.h
@@ -33,7 +33,7 @@ private:
 };
 
 template<typename T>
-Warning&
+inline Warning&
 operator<<(Warning& out, const T& val)
 {
     out.__str() << val;
@@ -60,7 +60,7 @@ private:
 };
 
 template<typename T>
-Error&
+inline Error&
 operator<<(Error& out, const T& val)
 {
     out.__str() << val;
@@ -88,7 +88,7 @@ private:
 };
 
 template<typename T>
-Trace&
+inline Trace&
 operator<<(Trace& out, const T& val)
 {
     out.__str() << val;
diff --git a/cpp/include/Ice/Proxy.h b/cpp/include/Ice/Proxy.h
index 8044b601993..916bfc000be 100644
--- a/cpp/include/Ice/Proxy.h
+++ b/cpp/include/Ice/Proxy.h
@@ -66,7 +66,7 @@ namespace IceProxy { namespace Ice
 typedef ::std::map< ::std::string, ::std::string> Context;
 #endif
 
-class ICE_API Object : public ::IceUtil::Shared, ::IceUtil::Mutex
+class ICE_API Object : public ::IceUtil::Shared, private ::IceUtil::Mutex
 {
 public:
 
diff --git a/cpp/include/Ice/ProxyF.h b/cpp/include/Ice/ProxyF.h
index 3550e730d6d..32af17f7a97 100644
--- a/cpp/include/Ice/ProxyF.h
+++ b/cpp/include/Ice/ProxyF.h
@@ -1,3 +1,4 @@
+
 // **********************************************************************
 //
 // Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved.
@@ -10,7 +11,7 @@
 #ifndef ICE_PROXY_F_H
 #define ICE_PROXY_F_H
 
-#include <Ice/ProxyHandle.h>
+#include <Ice/Config.h>
 
 namespace IceProxy
 {
@@ -77,6 +78,9 @@ ICE_API void decRef(::IceDelegateD::Ice::Object*);
 
 }
 
+
+#include <Ice/ProxyHandle.h>
+
 namespace Ice
 {
 
diff --git a/cpp/include/IceUtil/Config.h b/cpp/include/IceUtil/Config.h
index 05de38222f9..4fff5035340 100644
--- a/cpp/include/IceUtil/Config.h
+++ b/cpp/include/IceUtil/Config.h
@@ -18,7 +18,7 @@
 //
 #if defined(__i386) || defined(_M_IX86) || defined (__x86_64)
 #   define ICE_LITTLE_ENDIAN
-#elif defined(__sparc) || defined(__sparc__) || defined(__hppa) || defined(__ppc__)
+#elif defined(__sparc) || defined(__sparc__) || defined(__hppa) || defined(__ppc__) || defined(_ARCH_COM)
 #   define ICE_BIG_ENDIAN
 #else
 #   error "Unknown architecture"
diff --git a/cpp/include/IceUtil/OutputUtil.h b/cpp/include/IceUtil/OutputUtil.h
index 3f95d2ef657..0d718ec838d 100644
--- a/cpp/include/IceUtil/OutputUtil.h
+++ b/cpp/include/IceUtil/OutputUtil.h
@@ -119,7 +119,7 @@ private:
 };
 
 template<typename T>
-Output&
+inline Output&
 operator<<(Output& out, const T& val)
 {
     std::ostringstream s;
@@ -129,7 +129,7 @@ operator<<(Output& out, const T& val)
 }
 
 template<typename T>
-Output&
+inline Output&
 operator<<(Output& out, const std::vector<T>& val)
 {
     for(typename std::vector<T>::const_iterator p = val.begin(); p != val.end(); ++p)
@@ -147,7 +147,7 @@ operator<<(Output& out, const std::vector<T>& val)
 //
 
 template<typename T>
-Output&
+inline Output&
 operator<<(Output& out, std::vector<T>& val)
 {
     for(typename std::vector<T>::const_iterator p = val.begin(); p != val.end(); ++p)
@@ -269,7 +269,7 @@ private:
 };
 
 template<typename T>
-XMLOutput&
+inline XMLOutput&
 operator<<(XMLOutput& out, const T& val)
 {
     std::ostringstream s;