C++ Consistent usage of public virtual

76 files changed, 171 insertions, 171 deletions

diff --git a/cpp/include/Glacier2/SessionHelper.h b/cpp/include/Glacier2/SessionHelper.h
index 128311b8e84..509aa4e3ec8 100644
--- a/cpp/include/Glacier2/SessionHelper.h
+++ b/cpp/include/Glacier2/SessionHelper.h
@@ -51,7 +51,7 @@ public:
 };
 ICE_DEFINE_PTR(SessionHelperPtr, SessionHelper);
 
-class GLACIER2_API SessionCallback : virtual public ICE_SHARED
+class GLACIER2_API SessionCallback : public virtual ICE_SHARED
 {
 
 public:
diff --git a/cpp/include/Ice/AsyncResult.h b/cpp/include/Ice/AsyncResult.h
index 12a021e9e7f..82b6a49481d 100644
--- a/cpp/include/Ice/AsyncResult.h
+++ b/cpp/include/Ice/AsyncResult.h
@@ -193,7 +193,7 @@ public:
 //
 // Base class for generic callbacks.
 //
-class ICE_API GenericCallbackBase : virtual public CallbackBase
+class ICE_API GenericCallbackBase : public virtual CallbackBase
 {
 };
 
diff --git a/cpp/include/Ice/Dispatcher.h b/cpp/include/Ice/Dispatcher.h
index 8d67c4b446e..de9ff2744d1 100644
--- a/cpp/include/Ice/Dispatcher.h
+++ b/cpp/include/Ice/Dispatcher.h
@@ -18,7 +18,7 @@
 namespace Ice
 {
 
-class ICE_API DispatcherCall : virtual public IceUtil::Shared
+class ICE_API DispatcherCall : public virtual IceUtil::Shared
 {
 public:
 
@@ -29,7 +29,7 @@ public:
 
 typedef IceUtil::Handle<DispatcherCall> DispatcherCallPtr;
 
-class ICE_API Dispatcher : virtual public IceUtil::Shared
+class ICE_API Dispatcher : public virtual IceUtil::Shared
 {
 public:
 
diff --git a/cpp/include/Ice/GCObject.h b/cpp/include/Ice/GCObject.h
index 990dee9a475..49fbf093398 100644
--- a/cpp/include/Ice/GCObject.h
+++ b/cpp/include/Ice/GCObject.h
@@ -33,7 +33,7 @@ public:
     virtual bool visit(GCObject*) = 0;
 };
 
-class ICE_API GCObject : virtual public Ice::Object
+class ICE_API GCObject : public virtual Ice::Object
 {
 public:
 
diff --git a/cpp/include/Ice/IncomingAsync.h b/cpp/include/Ice/IncomingAsync.h
index de7b5510793..9221c1c12a2 100644
--- a/cpp/include/Ice/IncomingAsync.h
+++ b/cpp/include/Ice/IncomingAsync.h
@@ -17,7 +17,7 @@
 namespace Ice
 {
 
-class ICE_API AMDCallback : virtual public Ice::LocalObject
+class ICE_API AMDCallback : public virtual Ice::LocalObject
 {
 public:
 
@@ -90,7 +90,7 @@ private:
 namespace Ice
 {
 
-class ICE_API AMD_Object_ice_invoke : virtual public Ice::AMDCallback
+class ICE_API AMD_Object_ice_invoke : public virtual Ice::AMDCallback
 {
 public:
     
diff --git a/cpp/include/Ice/LocalObject.h b/cpp/include/Ice/LocalObject.h
index 1505d105080..1fbbdf153f1 100644
--- a/cpp/include/Ice/LocalObject.h
+++ b/cpp/include/Ice/LocalObject.h
@@ -23,7 +23,7 @@ class BasicStream;
 namespace Ice
 {
 
-class ICE_API LocalObject : virtual public ::IceUtil::Shared
+class ICE_API LocalObject : public virtual ::IceUtil::Shared
 {
 public:
 
diff --git a/cpp/include/Ice/MetricsAdminI.h b/cpp/include/Ice/MetricsAdminI.h
index 7f0f191b0cc..f9f1c65d786 100644
--- a/cpp/include/Ice/MetricsAdminI.h
+++ b/cpp/include/Ice/MetricsAdminI.h
@@ -121,7 +121,7 @@ protected:
 
 class ICE_API MetricsMapFactory :
 #ifdef ICE_CPP11_MAPPING
-    virtual public Ice::VirtualEnableSharedFromThisBase
+    public virtual Ice::VirtualEnableSharedFromThisBase
 #else
     public Ice::LocalObject
 #endif
@@ -156,7 +156,7 @@ public:
 
     class EntryT :
 #ifdef ICE_CPP11_MAPPING
-        virtual public Ice::VirtualEnableSharedFromThisBase
+        public virtual Ice::VirtualEnableSharedFromThisBase
 #else
         public Ice::LocalObject
 #endif
diff --git a/cpp/include/Ice/MetricsObserverI.h b/cpp/include/Ice/MetricsObserverI.h
index c46c0a9a932..e47f5cb81a4 100644
--- a/cpp/include/Ice/MetricsObserverI.h
+++ b/cpp/include/Ice/MetricsObserverI.h
@@ -333,7 +333,7 @@ newUpdater(const IceInternal::Handle<T>& updater, void (T::*fn)())
 }
 #endif
 
-template<typename T> class ObserverT : virtual public ::Ice::Instrumentation::Observer
+template<typename T> class ObserverT : public virtual ::Ice::Instrumentation::Observer
 {
 public:
 
diff --git a/cpp/include/Ice/NativePropertiesAdmin.h b/cpp/include/Ice/NativePropertiesAdmin.h
index 559e626413f..5eaf600ee36 100644
--- a/cpp/include/Ice/NativePropertiesAdmin.h
+++ b/cpp/include/Ice/NativePropertiesAdmin.h
@@ -35,7 +35,7 @@ namespace Ice
 
 class ICE_API PropertiesAdminUpdateCallback 
 #ifndef ICE_CPP11_MAPPING
-    : virtual public Ice::LocalObject
+    : public virtual Ice::LocalObject
 #endif
 {
 public:
@@ -46,7 +46,7 @@ ICE_DEFINE_PTR(PropertiesAdminUpdateCallbackPtr, PropertiesAdminUpdateCallback);
 
 class ICE_API NativePropertiesAdmin
 #ifndef ICE_CPP11_MAPPING
-    : virtual public IceUtil::Shared
+    : public virtual IceUtil::Shared
 #endif
 {
 public:
diff --git a/cpp/include/Ice/Object.h b/cpp/include/Ice/Object.h
index 4598cccde4e..565822b7f86 100644
--- a/cpp/include/Ice/Object.h
+++ b/cpp/include/Ice/Object.h
@@ -154,7 +154,7 @@ protected:
 };
 #endif
 
-class ICE_API Blobject : virtual public Object
+class ICE_API Blobject : public virtual Object
 {
 public:
 
@@ -166,7 +166,7 @@ public:
     virtual DispatchStatus __dispatch(IceInternal::Incoming&, const Current&);
 };
 
-class ICE_API BlobjectArray : virtual public Object
+class ICE_API BlobjectArray : public virtual Object
 {
 public:
 
@@ -178,7 +178,7 @@ public:
     virtual DispatchStatus __dispatch(IceInternal::Incoming&, const Current&);
 };
 
-class ICE_API BlobjectAsync : virtual public Object
+class ICE_API BlobjectAsync : public virtual Object
 {
 public:
 
@@ -193,7 +193,7 @@ public:
     virtual DispatchStatus __dispatch(IceInternal::Incoming&, const Current&);
 };
 
-class ICE_API BlobjectArrayAsync : virtual public Object
+class ICE_API BlobjectArrayAsync : public virtual Object
 {
 public:
 
diff --git a/cpp/include/Ice/Proxy.h b/cpp/include/Ice/Proxy.h
index c7fc946a49d..7098ad0abf4 100644
--- a/cpp/include/Ice/Proxy.h
+++ b/cpp/include/Ice/Proxy.h
@@ -408,7 +408,7 @@ private:
 };
 
 template<typename Prx, typename... Bases>
-class Proxy : virtual public Bases...
+class Proxy : public virtual Bases...
 {
 public:
 
@@ -677,25 +677,25 @@ class LocalException;
 ICE_API void ice_writeObjectPrx(const ::Ice::OutputStreamPtr&, const ObjectPrxPtr&);
 ICE_API void ice_readObjectPrx(const ::Ice::InputStreamPtr&, ObjectPrxPtr&);
 
-class Callback_Object_ice_isA_Base : virtual public ::IceInternal::CallbackBase { };
+class Callback_Object_ice_isA_Base : public virtual ::IceInternal::CallbackBase { };
 typedef ::IceUtil::Handle< Callback_Object_ice_isA_Base> Callback_Object_ice_isAPtr;
 
-class Callback_Object_ice_ping_Base : virtual public ::IceInternal::CallbackBase { };
+class Callback_Object_ice_ping_Base : public virtual ::IceInternal::CallbackBase { };
 typedef ::IceUtil::Handle< Callback_Object_ice_ping_Base> Callback_Object_ice_pingPtr;
 
-class Callback_Object_ice_ids_Base : virtual public ::IceInternal::CallbackBase { };
+class Callback_Object_ice_ids_Base : public virtual ::IceInternal::CallbackBase { };
 typedef ::IceUtil::Handle< Callback_Object_ice_ids_Base> Callback_Object_ice_idsPtr;
 
-class Callback_Object_ice_id_Base : virtual public ::IceInternal::CallbackBase { };
+class Callback_Object_ice_id_Base : public virtual ::IceInternal::CallbackBase { };
 typedef ::IceUtil::Handle< Callback_Object_ice_id_Base> Callback_Object_ice_idPtr;
 
-class Callback_Object_ice_invoke_Base : virtual public ::IceInternal::CallbackBase { };
+class Callback_Object_ice_invoke_Base : public virtual ::IceInternal::CallbackBase { };
 typedef ::IceUtil::Handle< Callback_Object_ice_invoke_Base> Callback_Object_ice_invokePtr;
 
-class Callback_Object_ice_flushBatchRequests_Base : virtual public ::IceInternal::CallbackBase { };
+class Callback_Object_ice_flushBatchRequests_Base : public virtual ::IceInternal::CallbackBase { };
 typedef ::IceUtil::Handle< Callback_Object_ice_flushBatchRequests_Base> Callback_Object_ice_flushBatchRequestsPtr;
 
-class Callback_Object_ice_getConnection_Base : virtual public ::IceInternal::CallbackBase { };
+class Callback_Object_ice_getConnection_Base : public virtual ::IceInternal::CallbackBase { };
 typedef ::IceUtil::Handle< Callback_Object_ice_getConnection_Base> Callback_Object_ice_getConnectionPtr;
 
 }
@@ -1414,7 +1414,7 @@ namespace IceInternal
 // Base template for operation callbacks.
 //
 template<class T>
-class CallbackNC : virtual public CallbackBase
+class CallbackNC : public virtual CallbackBase
 {
 public:
 
@@ -1470,7 +1470,7 @@ private:
 };
 
 template<class T, typename CT>
-class Callback : virtual public CallbackBase
+class Callback : public virtual CallbackBase
 {
 public:
 
diff --git a/cpp/include/Ice/SlicedData.h b/cpp/include/Ice/SlicedData.h
index f104ceb15f4..83ef02bce94 100644
--- a/cpp/include/Ice/SlicedData.h
+++ b/cpp/include/Ice/SlicedData.h
@@ -81,7 +81,7 @@ class ICE_API UnknownSlicedObject
 #ifdef ICE_CPP11_MAPPING
     : public ValueHelper<UnknownSlicedObject, Value>
 #else
-    : virtual public Object, private IceInternal::GCObject
+    : public virtual Object, private IceInternal::GCObject
 #endif
 {
 public:
diff --git a/cpp/include/Ice/VirtualShared.h b/cpp/include/Ice/VirtualShared.h
index dac3b555171..3dd06ea55e0 100644
--- a/cpp/include/Ice/VirtualShared.h
+++ b/cpp/include/Ice/VirtualShared.h
@@ -45,7 +45,7 @@ public:
 
 #else // C++98
 
-template<typename T> class EnableSharedFromThis : virtual public IceUtil::Shared
+template<typename T> class EnableSharedFromThis : public virtual IceUtil::Shared
 {
 public:
 
diff --git a/cpp/include/IceUtil/Thread.h b/cpp/include/IceUtil/Thread.h
index 2c573e4615d..54203cf0ee0 100644
--- a/cpp/include/IceUtil/Thread.h
+++ b/cpp/include/IceUtil/Thread.h
@@ -112,7 +112,7 @@ private:
 #endif
 };
 
-class ICE_UTIL_API Thread : virtual public IceUtil::Shared
+class ICE_UTIL_API Thread : public virtual IceUtil::Shared
 {
 public:
 
diff --git a/cpp/include/IceUtil/Timer.h b/cpp/include/IceUtil/Timer.h
index 9457730abf6..57fc5138710 100644
--- a/cpp/include/IceUtil/Timer.h
+++ b/cpp/include/IceUtil/Timer.h
@@ -30,7 +30,7 @@ typedef IceUtil::Handle<Timer> TimerPtr;
 //
 class ICE_UTIL_API TimerTask
 #ifndef ICE_CPP11_MAPPING
-    : virtual public IceUtil::Shared
+    : public virtual IceUtil::Shared
 #endif
 {
 public:
@@ -46,7 +46,7 @@ ICE_DEFINE_PTR(TimerTaskPtr, TimerTask);
 // repeated execution. Tasks are executed by the dedicated timer thread 
 // sequentially.
 //
-class ICE_UTIL_API Timer : virtual public IceUtil::Shared, private IceUtil::Thread
+class ICE_UTIL_API Timer : public virtual IceUtil::Shared, private IceUtil::Thread
 {
 public:
 
diff --git a/cpp/include/Slice/Parser.h b/cpp/include/Slice/Parser.h
index 4722b625206..71ebf494ea5 100644
--- a/cpp/include/Slice/Parser.h
+++ b/cpp/include/Slice/Parser.h
@@ -309,7 +309,7 @@ protected:
 // Type
 // ----------------------------------------------------------------------
 
-class SLICE_API Type : virtual public SyntaxTreeBase
+class SLICE_API Type : public virtual SyntaxTreeBase
 {
 public:
 
@@ -328,7 +328,7 @@ protected:
 // Builtin
 // ----------------------------------------------------------------------
 
-class SLICE_API Builtin : virtual public Type
+class SLICE_API Builtin : public virtual Type
 {
 public:
 
@@ -371,7 +371,7 @@ protected:
 // Contained
 // ----------------------------------------------------------------------
 
-class SLICE_API Contained : virtual public SyntaxTreeBase
+class SLICE_API Contained : public virtual SyntaxTreeBase
 {
 public:
 
@@ -438,7 +438,7 @@ protected:
 // Container
 // ----------------------------------------------------------------------
 
-class SLICE_API Container : virtual public SyntaxTreeBase
+class SLICE_API Container : public virtual SyntaxTreeBase
 {
 public:
 
@@ -518,7 +518,7 @@ protected:
 // Module
 // ----------------------------------------------------------------------
 
-class SLICE_API Module : virtual public Container, virtual public Contained
+class SLICE_API Module : public virtual Container, public virtual Contained
 {
 public:
 
@@ -537,7 +537,7 @@ protected:
 // Constructed
 // ----------------------------------------------------------------------
 
-class SLICE_API Constructed : virtual public Type, virtual public Contained
+class SLICE_API Constructed : public virtual Type, public virtual Contained
 {
 public:
 
@@ -558,7 +558,7 @@ protected:
 // ClassDecl
 // ----------------------------------------------------------------------
 
-class SLICE_API ClassDecl : virtual public Constructed
+class SLICE_API ClassDecl : public virtual Constructed
 {
 public:
 
@@ -600,7 +600,7 @@ private:
 // Operation
 // ----------------------------------------------------------------------
 
-class SLICE_API Operation : virtual public Contained, virtual public Container
+class SLICE_API Operation : public virtual Contained, public virtual Container
 {
 public:
 
@@ -658,7 +658,7 @@ protected:
 // so if you need the class as a "constructed type", use the
 // declaration() operation to navigate to the class declaration.
 //
-class SLICE_API ClassDef : virtual public Container, virtual public Contained
+class SLICE_API ClassDef : public virtual Container, public virtual Contained
 {
 public:
 
@@ -710,7 +710,7 @@ protected:
 // Proxy
 // ----------------------------------------------------------------------
 
-class SLICE_API Proxy : virtual public Type
+class SLICE_API Proxy : public virtual Type
 {
 public:
 
@@ -734,7 +734,7 @@ protected:
 // ----------------------------------------------------------------------
 
 // No inheritance from Constructed, as this is not a Type
-class SLICE_API Exception : virtual public Container, virtual public Contained
+class SLICE_API Exception : public virtual Container, public virtual Contained
 {
 public:
 
@@ -771,7 +771,7 @@ protected:
 // Struct
 // ----------------------------------------------------------------------
 
-class SLICE_API Struct : virtual public Container, virtual public Constructed
+class SLICE_API Struct : public virtual Container, public virtual Constructed
 {
 public:
 
@@ -799,7 +799,7 @@ protected:
 // Sequence
 // ----------------------------------------------------------------------
 
-class SLICE_API Sequence : virtual public Constructed
+class SLICE_API Sequence : public virtual Constructed
 {
 public:
 
@@ -827,7 +827,7 @@ protected:
 // Dictionary
 // ----------------------------------------------------------------------
 
-class SLICE_API Dictionary : virtual public Constructed
+class SLICE_API Dictionary : public virtual Constructed
 {
 public:
 
@@ -862,7 +862,7 @@ protected:
 // Enum
 // ----------------------------------------------------------------------
 
-class SLICE_API Enum : virtual public Constructed
+class SLICE_API Enum : public virtual Constructed
 {
 public:
 
@@ -896,7 +896,7 @@ protected:
 // Enumerator
 // ----------------------------------------------------------------------
 
-class SLICE_API Enumerator : virtual public Contained
+class SLICE_API Enumerator : public virtual Contained
 {
 public:
 
@@ -924,7 +924,7 @@ protected:
 // Const
 // ----------------------------------------------------------------------
 
-class SLICE_API Const : virtual public Contained
+class SLICE_API Const : public virtual Contained
 {
 public:
 
@@ -955,7 +955,7 @@ protected:
 // ParamDecl
 // ----------------------------------------------------------------------
 
-class SLICE_API ParamDecl : virtual public Contained
+class SLICE_API ParamDecl : public virtual Contained
 {
 public:
 
@@ -983,7 +983,7 @@ protected:
 // DataMember
 // ----------------------------------------------------------------------
 
-class SLICE_API DataMember : virtual public Contained
+class SLICE_API DataMember : public virtual Contained
 {
 public:
 
@@ -1019,7 +1019,7 @@ protected:
 // Unit
 // ----------------------------------------------------------------------
 
-class SLICE_API Unit : virtual public Container
+class SLICE_API Unit : public virtual Container
 {
 public:
 
diff --git a/cpp/src/Ice/Acceptor.h b/cpp/src/Ice/Acceptor.h
index a1477a3dc48..d6048c0f4b5 100644
--- a/cpp/src/Ice/Acceptor.h
+++ b/cpp/src/Ice/Acceptor.h
@@ -19,7 +19,7 @@
 namespace IceInternal
 {
 
-class ICE_API Acceptor : virtual public ::IceUtil::Shared
+class ICE_API Acceptor : public virtual ::IceUtil::Shared
 {
 public:
 
diff --git a/cpp/src/Ice/ConnectionFactory.h b/cpp/src/Ice/ConnectionFactory.h
index ecf170aed68..e40aa6358d1 100644
--- a/cpp/src/Ice/ConnectionFactory.h
+++ b/cpp/src/Ice/ConnectionFactory.h
@@ -44,11 +44,11 @@ ICE_DEFINE_PTR(ObjectAdapterIPtr, ObjectAdapterI);
 namespace IceInternal
 {
 
-class OutgoingConnectionFactory : virtual public IceUtil::Shared, public IceUtil::Monitor<IceUtil::Mutex>
+class OutgoingConnectionFactory : public virtual IceUtil::Shared, public IceUtil::Monitor<IceUtil::Mutex>
 {
 public:
 
-    class CreateConnectionCallback : virtual public IceUtil::Shared
+    class CreateConnectionCallback : public virtual IceUtil::Shared
     {
     public:
 
diff --git a/cpp/src/Ice/ConnectionI.h b/cpp/src/Ice/ConnectionI.h
index 2109b52f6b3..0b2f3e66b97 100644
--- a/cpp/src/Ice/ConnectionI.h
+++ b/cpp/src/Ice/ConnectionI.h
@@ -147,7 +147,7 @@ public:
     };
     typedef ::std::shared_ptr<StartCallback> StartCallbackPtr;
 #else
-    class StartCallback : virtual public IceUtil::Shared
+    class StartCallback : public virtual IceUtil::Shared
     {
     public:
 
diff --git a/cpp/src/Ice/EventHandler.h b/cpp/src/Ice/EventHandler.h
index a11299d9326..9394984f339 100644
--- a/cpp/src/Ice/EventHandler.h
+++ b/cpp/src/Ice/EventHandler.h
@@ -23,9 +23,9 @@ namespace IceInternal
 
 class ICE_API EventHandler : 
 #ifdef ICE_CPP11_MAPPING
-    virtual public Ice::VirtualEnableSharedFromThisBase
+    public virtual Ice::VirtualEnableSharedFromThisBase
 #else
-    virtual public Ice::LocalObject
+    public virtual Ice::LocalObject
 #endif
 {
 public:
diff --git a/cpp/src/Ice/InstrumentationI.h b/cpp/src/Ice/InstrumentationI.h
index 7ae26d19b2b..45bc64f73cf 100644
--- a/cpp/src/Ice/InstrumentationI.h
+++ b/cpp/src/Ice/InstrumentationI.h
@@ -16,7 +16,7 @@
 namespace IceInternal
 {
 
-template<typename T, typename O> class ObserverWithDelegateT : public IceMX::ObserverT<T>, virtual public O
+template<typename T, typename O> class ObserverWithDelegateT : public IceMX::ObserverT<T>, public virtual O
 {
 public:
 
diff --git a/cpp/src/Ice/LocatorInfo.h b/cpp/src/Ice/LocatorInfo.h
index 2c50be287d9..4055022f351 100644
--- a/cpp/src/Ice/LocatorInfo.h
+++ b/cpp/src/Ice/LocatorInfo.h
@@ -79,7 +79,7 @@ class LocatorInfo : public IceUtil::Shared, public IceUtil::Mutex
 {
 public:
 
-    class GetEndpointsCallback : virtual public IceUtil::Shared
+    class GetEndpointsCallback : public virtual IceUtil::Shared
     {
     public:
 
@@ -88,7 +88,7 @@ public:
     };
     typedef IceUtil::Handle<GetEndpointsCallback> GetEndpointsCallbackPtr;
 
-    class RequestCallback : virtual public IceUtil::Shared
+    class RequestCallback : public virtual IceUtil::Shared
     {
     public:
 
@@ -105,7 +105,7 @@ public:
     };
     typedef IceUtil::Handle<RequestCallback> RequestCallbackPtr;
 
-    class Request : virtual public IceUtil::Shared
+    class Request : public virtual IceUtil::Shared
     {
     public:
 
diff --git a/cpp/src/Ice/Network.h b/cpp/src/Ice/Network.h
index a398fa1209c..cc61bbe67ee 100644
--- a/cpp/src/Ice/Network.h
+++ b/cpp/src/Ice/Network.h
@@ -186,7 +186,7 @@ struct ICE_API AsyncInfo
 delegate void SocketOperationCompletedHandler(int);
 #endif
 
-class ICE_API ReadyCallback : virtual public ::IceUtil::Shared
+class ICE_API ReadyCallback : public virtual ::IceUtil::Shared
 {
 public:
 
@@ -194,7 +194,7 @@ public:
 };
 typedef IceUtil::Handle<ReadyCallback> ReadyCallbackPtr;
 
-class ICE_API NativeInfo : virtual public IceUtil::Shared
+class ICE_API NativeInfo : public virtual IceUtil::Shared
 {
 public:
 
diff --git a/cpp/src/Ice/NetworkProxy.h b/cpp/src/Ice/NetworkProxy.h
index 606ac85c35b..e6349989550 100644
--- a/cpp/src/Ice/NetworkProxy.h
+++ b/cpp/src/Ice/NetworkProxy.h
@@ -15,7 +15,7 @@
 namespace IceInternal
 {
 
-class ICE_API NetworkProxy : virtual public IceUtil::Shared
+class ICE_API NetworkProxy : public virtual IceUtil::Shared
 {
 public:
 
diff --git a/cpp/src/Ice/Reference.h b/cpp/src/Ice/Reference.h
index d10e2c71c3d..23baff439b9 100644
--- a/cpp/src/Ice/Reference.h
+++ b/cpp/src/Ice/Reference.h
@@ -38,7 +38,7 @@ public:
 
     class GetConnectionCallback 
 #ifndef ICE_CPP11_MAPPING
-        : virtual public IceUtil::Shared
+        : public virtual IceUtil::Shared
 #endif
     {
     public:
diff --git a/cpp/src/Ice/RequestHandler.h b/cpp/src/Ice/RequestHandler.h
index d222c8787c8..c5d43370141 100644
--- a/cpp/src/Ice/RequestHandler.h
+++ b/cpp/src/Ice/RequestHandler.h
@@ -71,7 +71,7 @@ private:
 
 class CancellationHandler
 #ifndef ICE_CPP11_MAPPING
-    : virtual public IceUtil::Shared
+    : public virtual IceUtil::Shared
 #endif
 {
 public:
diff --git a/cpp/src/Ice/RouterInfo.h b/cpp/src/Ice/RouterInfo.h
index 9f6a1dbfef2..43974e5331e 100644
--- a/cpp/src/Ice/RouterInfo.h
+++ b/cpp/src/Ice/RouterInfo.h
@@ -59,7 +59,7 @@ class RouterInfo : public IceUtil::Shared, public IceUtil::Mutex
 {
 public:
 
-    class GetClientEndpointsCallback : virtual public Ice::LocalObject
+    class GetClientEndpointsCallback : public virtual Ice::LocalObject
     {
     public:
         
@@ -70,7 +70,7 @@ public:
 
     class AddProxyCallback 
 #ifndef ICE_CPP11_MAPPING
-        : virtual public IceUtil::Shared
+        : public virtual IceUtil::Shared
 #endif
     {
     public:
diff --git a/cpp/src/Ice/ThreadPool.h b/cpp/src/Ice/ThreadPool.h
index 3a440f5ca32..6469d48c7b7 100644
--- a/cpp/src/Ice/ThreadPool.h
+++ b/cpp/src/Ice/ThreadPool.h
@@ -37,7 +37,7 @@ class ThreadPoolCurrent;
 class ThreadPoolWorkQueue;
 ICE_DEFINE_PTR(ThreadPoolWorkQueuePtr, ThreadPoolWorkQueue);
 
-class ThreadPoolWorkItem : virtual public IceUtil::Shared
+class ThreadPoolWorkItem : public virtual IceUtil::Shared
 {
 public:
 
diff --git a/cpp/src/Ice/Transceiver.h b/cpp/src/Ice/Transceiver.h
index b9ca6e14f40..b129ee5c923 100644
--- a/cpp/src/Ice/Transceiver.h
+++ b/cpp/src/Ice/Transceiver.h
@@ -21,7 +21,7 @@ namespace IceInternal
 
 class Buffer;
 
-class ICE_API Transceiver : virtual public ::IceUtil::Shared
+class ICE_API Transceiver : public virtual ::IceUtil::Shared
 {
 public:
 
diff --git a/cpp/src/Ice/WSEndpoint.h b/cpp/src/Ice/WSEndpoint.h
index 6c11da77775..c6bec0f1082 100644
--- a/cpp/src/Ice/WSEndpoint.h
+++ b/cpp/src/Ice/WSEndpoint.h
@@ -24,7 +24,7 @@ namespace IceInternal
 // Delegate interface implemented by TcpEndpoint or IceSSL::Endpoint or any endpoint that WS can
 // delegate to.
 //
-class ICE_API WSEndpointDelegate : virtual public IceUtil::Shared
+class ICE_API WSEndpointDelegate : public virtual IceUtil::Shared
 {
 public:
 
diff --git a/cpp/src/Ice/WSTransceiver.h b/cpp/src/Ice/WSTransceiver.h
index c35d739aead..e7703606555 100644
--- a/cpp/src/Ice/WSTransceiver.h
+++ b/cpp/src/Ice/WSTransceiver.h
@@ -28,7 +28,7 @@ class AcceptorI;
 // Delegate interface implemented by TcpTransceiver or IceSSL::Transceiver or any transport that WS can
 // delegate to.
 //
-class ICE_API WSTransceiverDelegate : virtual public IceUtil::Shared
+class ICE_API WSTransceiverDelegate : public virtual IceUtil::Shared
 {
 public:
 
diff --git a/cpp/src/IceGrid/AdapterCache.h b/cpp/src/IceGrid/AdapterCache.h
index b97ab88df15..9d5b156622b 100644
--- a/cpp/src/IceGrid/AdapterCache.h
+++ b/cpp/src/IceGrid/AdapterCache.h
@@ -42,7 +42,7 @@ struct LocatorAdapterInfo
 };
 typedef std::vector<LocatorAdapterInfo> LocatorAdapterInfoSeq;
 
-class AdapterEntry : virtual public IceUtil::Shared
+class AdapterEntry : public virtual IceUtil::Shared
 {
 public:
     
diff --git a/cpp/src/IceGrid/AdminI.cpp b/cpp/src/IceGrid/AdminI.cpp
index 3163c2dfcd4..30c0327ca84 100644
--- a/cpp/src/IceGrid/AdminI.cpp
+++ b/cpp/src/IceGrid/AdminI.cpp
@@ -415,7 +415,7 @@ AdminI::getServerAdmin(const string& id, const Current& current) const
 namespace
 {
 
-class StartCB : virtual public IceUtil::Shared
+class StartCB : public virtual IceUtil::Shared
 {
 public:
 
@@ -469,7 +469,7 @@ AdminI::startServer_async(const AMD_Admin_startServerPtr& amdCB, const string& i
 namespace
 {
 
-class StopCB : virtual public IceUtil::Shared
+class StopCB : public virtual IceUtil::Shared
 {
 public:
 
diff --git a/cpp/src/IceGrid/AdminSessionI.h b/cpp/src/IceGrid/AdminSessionI.h
index 9b23c604b98..959c20761b7 100644
--- a/cpp/src/IceGrid/AdminSessionI.h
+++ b/cpp/src/IceGrid/AdminSessionI.h
@@ -81,7 +81,7 @@ private:
 };
 typedef IceUtil::Handle<AdminSessionI> AdminSessionIPtr;
 
-class AdminSessionFactory : virtual public IceUtil::Shared
+class AdminSessionFactory : public virtual IceUtil::Shared
 {
 public:
 
@@ -103,7 +103,7 @@ private:
 };
 typedef IceUtil::Handle<AdminSessionFactory> AdminSessionFactoryPtr;
 
-class AdminSessionManagerI : virtual public Glacier2::SessionManager
+class AdminSessionManagerI : public virtual Glacier2::SessionManager
 {
 public:
 
@@ -116,7 +116,7 @@ private:
     const AdminSessionFactoryPtr _factory;
 };
 
-class AdminSSLSessionManagerI : virtual public Glacier2::SSLSessionManager
+class AdminSSLSessionManagerI : public virtual Glacier2::SSLSessionManager
 {
 public:
 
diff --git a/cpp/src/IceGrid/Allocatable.h b/cpp/src/IceGrid/Allocatable.h
index f96c78e46d6..a77965d2f01 100644
--- a/cpp/src/IceGrid/Allocatable.h
+++ b/cpp/src/IceGrid/Allocatable.h
@@ -70,7 +70,7 @@ private:
 };
 typedef IceUtil::Handle<AllocationRequest> AllocationRequestPtr;
 
-class Allocatable : virtual public IceUtil::Shared, public IceUtil::Monitor<IceUtil::Mutex>
+class Allocatable : public virtual IceUtil::Shared, public IceUtil::Monitor<IceUtil::Mutex>
 {
 public:
 
diff --git a/cpp/src/IceGrid/Cache.h b/cpp/src/IceGrid/Cache.h
index d4c80c117d8..ab42388defe 100644
--- a/cpp/src/IceGrid/Cache.h
+++ b/cpp/src/IceGrid/Cache.h
@@ -18,7 +18,7 @@
 namespace IceGrid
 {
 
-class SynchronizationCallback : virtual public IceUtil::Shared
+class SynchronizationCallback : public virtual IceUtil::Shared
 {
 public:
 
diff --git a/cpp/src/IceGrid/LocatorI.cpp b/cpp/src/IceGrid/LocatorI.cpp
index bd9786d11bb..18c9d4d8be9 100644
--- a/cpp/src/IceGrid/LocatorI.cpp
+++ b/cpp/src/IceGrid/LocatorI.cpp
@@ -23,7 +23,7 @@ namespace IceGrid
 //
 // Callback from asynchronous call to adapter->getDirectProxy() invoked in LocatorI::findAdapterById_async().
 //
-class AdapterGetDirectProxyCallback : virtual public IceUtil::Shared
+class AdapterGetDirectProxyCallback : public virtual IceUtil::Shared
 {
 public:
 
@@ -49,7 +49,7 @@ private:
     const LocatorAdapterInfo _adapter;
 };
 
-class AdapterActivateCallback : virtual public IceUtil::Shared
+class AdapterActivateCallback : public virtual IceUtil::Shared
 {
 public:
 
diff --git a/cpp/src/IceGrid/LocatorI.h b/cpp/src/IceGrid/LocatorI.h
index 2d420f41aab..13fa992a8ba 100644
--- a/cpp/src/IceGrid/LocatorI.h
+++ b/cpp/src/IceGrid/LocatorI.h
@@ -37,7 +37,7 @@ class LocatorI : public Locator, public IceUtil::Mutex
 {
 public:
 
-    class Request : virtual public IceUtil::Shared
+    class Request : public virtual IceUtil::Shared
     {
     public:
 
diff --git a/cpp/src/IceGrid/LocatorRegistryI.cpp b/cpp/src/IceGrid/LocatorRegistryI.cpp
index 47bada66a43..b2254074362 100644
--- a/cpp/src/IceGrid/LocatorRegistryI.cpp
+++ b/cpp/src/IceGrid/LocatorRegistryI.cpp
@@ -88,7 +88,7 @@ newSetDirectProxyCB(const AmdCB& cb, const TraceLevelsPtr& traceLevels, const st
     return new SetDirectProxyCB<AmdCB>(cb, traceLevels, id, p);
 }
 
-class ServerSetProcessCB : virtual public IceUtil::Shared
+class ServerSetProcessCB : public virtual IceUtil::Shared
 {
 public:
 
diff --git a/cpp/src/IceGrid/LocatorRegistryI.h b/cpp/src/IceGrid/LocatorRegistryI.h
index 1ba7a84c619..722073f9f91 100644
--- a/cpp/src/IceGrid/LocatorRegistryI.h
+++ b/cpp/src/IceGrid/LocatorRegistryI.h
@@ -29,7 +29,7 @@ class LocatorRegistryI : public Ice::LocatorRegistry
 {
 public:
     
-    class AdapterSetDirectProxyCB : virtual public IceUtil::Shared
+    class AdapterSetDirectProxyCB : public virtual IceUtil::Shared
     {
     public:
         
diff --git a/cpp/src/IceGrid/NodeCache.cpp b/cpp/src/IceGrid/NodeCache.cpp
index 13262248983..7acdb385865 100644
--- a/cpp/src/IceGrid/NodeCache.cpp
+++ b/cpp/src/IceGrid/NodeCache.cpp
@@ -178,7 +178,7 @@ struct ToInternalServerDescriptor : std::unary_function<CommunicatorDescriptorPt
     int _iceVersion;
 };
 
-class LoadCB : virtual public IceUtil::Shared
+class LoadCB : public virtual IceUtil::Shared
 {
 public:
 
@@ -245,7 +245,7 @@ private:
     const int _timeout;
 };
 
-class DestroyCB : virtual public IceUtil::Shared
+class DestroyCB : public virtual IceUtil::Shared
 {
 public:
 
diff --git a/cpp/src/IceGrid/NodeI.h b/cpp/src/IceGrid/NodeI.h
index 5a0a6f9a448..4bdf6d8ca10 100644
--- a/cpp/src/IceGrid/NodeI.h
+++ b/cpp/src/IceGrid/NodeI.h
@@ -42,7 +42,7 @@ class NodeI : public Node, public IceUtil::Monitor<IceUtil::Mutex>
 {
 public:
 
-    class Update : virtual public IceUtil::Shared
+    class Update : public virtual IceUtil::Shared
     {
     public:
         
diff --git a/cpp/src/IceGrid/SessionI.h b/cpp/src/IceGrid/SessionI.h
index 9b0a42654e0..ca62740fad8 100644
--- a/cpp/src/IceGrid/SessionI.h
+++ b/cpp/src/IceGrid/SessionI.h
@@ -35,7 +35,7 @@ typedef IceUtil::Handle<Allocatable> AllocatablePtr;
 class SessionI;
 typedef IceUtil::Handle<SessionI> SessionIPtr;
 
-class BaseSessionI : virtual public Ice::Object, public IceUtil::Mutex
+class BaseSessionI : public virtual Ice::Object, public IceUtil::Mutex
 {
 public:
 
@@ -106,7 +106,7 @@ protected:
     std::set<AllocatablePtr> _allocations;
 };
 
-class ClientSessionFactory : virtual public IceUtil::Shared
+class ClientSessionFactory : public virtual IceUtil::Shared
 {
 public:
 
@@ -128,7 +128,7 @@ private:
 };
 typedef IceUtil::Handle<ClientSessionFactory> ClientSessionFactoryPtr;
 
-class ClientSessionManagerI : virtual public Glacier2::SessionManager
+class ClientSessionManagerI : public virtual Glacier2::SessionManager
 {
 public:
 
@@ -141,7 +141,7 @@ private:
     const ClientSessionFactoryPtr _factory;
 };
 
-class ClientSSLSessionManagerI : virtual public Glacier2::SSLSessionManager
+class ClientSSLSessionManagerI : public virtual Glacier2::SSLSessionManager
 {
 public:
 
diff --git a/cpp/src/IceGrid/Topics.h b/cpp/src/IceGrid/Topics.h
index 30c6e2652c0..305158b98f6 100644
--- a/cpp/src/IceGrid/Topics.h
+++ b/cpp/src/IceGrid/Topics.h
@@ -19,7 +19,7 @@
 namespace IceGrid
 {
 
-class ObserverTopic : public IceUtil::Monitor<IceUtil::Mutex>, virtual public Ice::Object
+class ObserverTopic : public IceUtil::Monitor<IceUtil::Mutex>, public virtual Ice::Object
 {
 public:
 
diff --git a/cpp/src/IceGrid/WaitQueue.h b/cpp/src/IceGrid/WaitQueue.h
index 0a1e5e62d07..7f23ad9deeb 100644
--- a/cpp/src/IceGrid/WaitQueue.h
+++ b/cpp/src/IceGrid/WaitQueue.h
@@ -18,7 +18,7 @@
 namespace IceGrid
 {
 
-class WaitItem : virtual public IceUtil::Shared
+class WaitItem : public virtual IceUtil::Shared
 {
 public:
     
diff --git a/cpp/src/IceStorm/Replica.h b/cpp/src/IceStorm/Replica.h
index 96fb7795380..107ad69255d 100644
--- a/cpp/src/IceStorm/Replica.h
+++ b/cpp/src/IceStorm/Replica.h
@@ -34,7 +34,7 @@ struct GroupNodeInfo
     const Ice::ObjectPrx observer;
 };
 
-class Replica : virtual public IceUtil::Shared
+class Replica : public virtual IceUtil::Shared
 {
 public:
 
diff --git a/cpp/src/slice2cpp/Gen.cpp b/cpp/src/slice2cpp/Gen.cpp
index 14a8f60f8fd..83d6d35b65d 100644
--- a/cpp/src/slice2cpp/Gen.cpp
+++ b/cpp/src/slice2cpp/Gen.cpp
@@ -1611,7 +1611,7 @@ Slice::Gen::ProxyVisitor::visitClassDefStart(const ClassDefPtr& p)
     H << sp << nl << "class " << _dllExport << name << " : ";
     if(bases.empty())
     {
-        H << "virtual public ::IceProxy::Ice::Object";
+        H << "public virtual ::IceProxy::Ice::Object";
     }
     else
     {
@@ -1619,7 +1619,7 @@ Slice::Gen::ProxyVisitor::visitClassDefStart(const ClassDefPtr& p)
         ClassList::const_iterator q = bases.begin();
         while(q != bases.end())
         {
-            H << "virtual public ::IceProxy" << fixKwd((*q)->scoped());
+            H << "public virtual ::IceProxy" << fixKwd((*q)->scoped());
             if(++q != bases.end())
             {
                 H << ',' << nl;
@@ -2405,11 +2405,11 @@ Slice::Gen::ObjectVisitor::visitClassDefStart(const ClassDefPtr& p)
     {
         if(p->isLocal())
         {
-            H << "virtual public ::Ice::LocalObject";
+            H << "public virtual ::Ice::LocalObject";
         }
         else
         {
-            H << "virtual public ::Ice::Object";
+            H << "public virtual ::Ice::Object";
         }
     }
     else
@@ -3815,7 +3815,7 @@ Slice::Gen::AsyncCallbackVisitor::visitOperation(const OperationPtr& p)
     // Write the callback base class and callback smart pointer.
     //
     string delName = "Callback_" + cl->name() + "_" + p->name();
-    H << sp << nl << "class " << delName << "_Base : virtual public ::IceInternal::CallbackBase { };";
+    H << sp << nl << "class " << delName << "_Base : public virtual ::IceInternal::CallbackBase { };";
     H << nl << "typedef ::IceUtil::Handle< " << delName << "_Base> " << delName << "Ptr;";
 }
 
@@ -4331,10 +4331,10 @@ Slice::Gen::ImplVisitor::visitClassDefStart(const ClassDefPtr& p)
     H << sp;
     H << nl << "class " << name << "I : ";
     H.useCurrentPosAsIndent();
-    H << "virtual public " << fixKwd(name);
+    H << "public virtual " << fixKwd(name);
     for(ClassList::const_iterator q = bases.begin(); q != bases.end(); ++q)
     {
-        H << ',' << nl << "virtual public " << fixKwd((*q)->scope());
+        H << ',' << nl << "public virtual " << fixKwd((*q)->scope());
         if((*q)->isAbstract())
         {
             H << (*q)->name() << "I";
@@ -4644,7 +4644,7 @@ Slice::Gen::AsyncVisitor::visitOperation(const OperationPtr& p)
     if(cl->hasMetaData("amd") || p->hasMetaData("amd"))
     {
         H << sp << nl << "class " << _dllExport << classNameAMD << '_' << name
-          << " : virtual public ::Ice::AMDCallback";
+          << " : public virtual ::Ice::AMDCallback";
         H << sb;
         H.dec();
         H << nl << "public:";
@@ -6049,7 +6049,7 @@ Slice::Gen::Cpp11ProxyVisitor::visitClassDefStart(const ClassDefPtr& p)
         base = bases.front();
     }
 
-    H << sp << nl << "class " << _dllExport << p->name() << "Prx : virtual public ::Ice::Proxy<"
+    H << sp << nl << "class " << _dllExport << p->name() << "Prx : public virtual ::Ice::Proxy<"
       << fixKwd(p->name() + "Prx") << ", ";
     if(bases.empty() || (base && base->allOperations().empty()))
     {
@@ -7214,7 +7214,7 @@ Slice::Gen::Cpp11InterfaceVisitor::visitClassDefStart(const ClassDefPtr& p)
     H.useCurrentPosAsIndent();
     if(bases.empty() || (base && base->allOperations().empty()))
     {
-        H << "virtual public ::Ice::Object";
+        H << "public virtual ::Ice::Object";
     }
     else
     {
@@ -7224,7 +7224,7 @@ Slice::Gen::Cpp11InterfaceVisitor::visitClassDefStart(const ClassDefPtr& p)
             string baseSuffix = (*q)->isInterface() ? "" : "Disp";
             string baseScoped = fixKwd((*q)->scope() + (*q)->name() + baseSuffix);
 
-            H << "virtual public " << baseScoped;
+            H << "public virtual " << baseScoped;
             if(++q != bases.end())
             {
                 H << ',' << nl;
diff --git a/cpp/test/Glacier2/attack/Server.cpp b/cpp/test/Glacier2/attack/Server.cpp
index 39fab899370..0394d925121 100644
--- a/cpp/test/Glacier2/attack/Server.cpp
+++ b/cpp/test/Glacier2/attack/Server.cpp
@@ -14,7 +14,7 @@ using namespace std;
 using namespace Ice;
 using namespace Test;
 
-class ServantLocatorI : virtual public ServantLocator
+class ServantLocatorI : public virtual ServantLocator
 {
 public:
 
diff --git a/cpp/test/Glacier2/dynamicFiltering/Server.cpp b/cpp/test/Glacier2/dynamicFiltering/Server.cpp
index 7bcd27e3412..6ea761b6a32 100644
--- a/cpp/test/Glacier2/dynamicFiltering/Server.cpp
+++ b/cpp/test/Glacier2/dynamicFiltering/Server.cpp
@@ -23,7 +23,7 @@ using namespace Test;
 // simplicity, we essentially 'alias' all possible requests to a single
 // object adapter and a single servant.
 //
-class ServerLocatorRegistry : virtual public LocatorRegistry
+class ServerLocatorRegistry : public virtual LocatorRegistry
 {
 public:
 
@@ -49,7 +49,7 @@ public:
     }
 };
 
-class ServerLocatorI : virtual public Locator
+class ServerLocatorI : public virtual Locator
 {
 public:
     ServerLocatorI(BackendPtr backend, ObjectAdapterPtr adapter) :
@@ -84,7 +84,7 @@ private:
     LocatorRegistryPrx _registryPrx;
 };
 
-class ServantLocatorI : virtual public ServantLocator
+class ServantLocatorI : public virtual ServantLocator
 {
 public:
 
diff --git a/cpp/test/Glacier2/sessionControl/SessionI.cpp b/cpp/test/Glacier2/sessionControl/SessionI.cpp
index 51dbfec6ed5..54fc4499221 100644
--- a/cpp/test/Glacier2/sessionControl/SessionI.cpp
+++ b/cpp/test/Glacier2/sessionControl/SessionI.cpp
@@ -14,7 +14,7 @@
 using namespace std;
 using namespace Test;
 
-class DestroyCB : virtual public IceUtil::Shared
+class DestroyCB : public virtual IceUtil::Shared
 {
 public:
 
diff --git a/cpp/test/Glacier2/staticFiltering/Server.cpp b/cpp/test/Glacier2/staticFiltering/Server.cpp
index a467a4bff51..8c23e936f5b 100644
--- a/cpp/test/Glacier2/staticFiltering/Server.cpp
+++ b/cpp/test/Glacier2/staticFiltering/Server.cpp
@@ -20,7 +20,7 @@ using namespace Test;
 // simplicity, we essentially 'alias' all possible requests to a single
 // object adapter and a single servant.
 //
-class ServerLocatorRegistry : virtual public LocatorRegistry
+class ServerLocatorRegistry : public virtual LocatorRegistry
 {
 public:
 
@@ -46,7 +46,7 @@ public:
     }
 };
 
-class ServerLocatorI : virtual public Locator
+class ServerLocatorI : public virtual Locator
 {
 public:
     ServerLocatorI(const BackendPtr& backend, const ObjectAdapterPtr& adapter) :
@@ -82,7 +82,7 @@ private:
     const LocatorRegistryPrx _registryPrx;
 };
 
-class ServantLocatorI : virtual public ServantLocator
+class ServantLocatorI : public virtual ServantLocator
 {
 public:
 
diff --git a/cpp/test/Ice/admin/TestI.h b/cpp/test/Ice/admin/TestI.h
index 5a207838356..4ccf5af41bf 100644
--- a/cpp/test/Ice/admin/TestI.h
+++ b/cpp/test/Ice/admin/TestI.h
@@ -14,8 +14,8 @@
 #include <TestCommon.h>
 #include <Ice/NativePropertiesAdmin.h>
 
-class RemoteCommunicatorI : virtual public Test::RemoteCommunicator,
-                            virtual public Ice::PropertiesAdminUpdateCallback,
+class RemoteCommunicatorI : public virtual Test::RemoteCommunicator,
+                            public virtual Ice::PropertiesAdminUpdateCallback,
                             public IceUtil::Monitor<IceUtil::Mutex>
 {
 public:
diff --git a/cpp/test/Ice/ami/TestI.h b/cpp/test/Ice/ami/TestI.h
index c96f76b834b..4bf3a49c4a4 100644
--- a/cpp/test/Ice/ami/TestI.h
+++ b/cpp/test/Ice/ami/TestI.h
@@ -16,7 +16,7 @@
 class TestIntfControllerI;
 ICE_DEFINE_PTR(TestIntfControllerIPtr, TestIntfControllerI);
 
-class TestIntfI : virtual public Test::TestIntf, public IceUtil::Monitor<IceUtil::Mutex>
+class TestIntfI : public virtual Test::TestIntf, public IceUtil::Monitor<IceUtil::Mutex>
 {
 public:
 
diff --git a/cpp/test/Ice/background/TestI.h b/cpp/test/Ice/background/TestI.h
index fdef89a8791..18d7aa27bad 100644
--- a/cpp/test/Ice/background/TestI.h
+++ b/cpp/test/Ice/background/TestI.h
@@ -19,7 +19,7 @@
 class BackgroundControllerI;
 ICE_DEFINE_PTR(BackgroundControllerIPtr, BackgroundControllerI);
 
-class BackgroundI : virtual public Test::Background
+class BackgroundI : public virtual Test::Background
 {
 public:
 
diff --git a/cpp/test/Ice/custom/TestAMDI.h b/cpp/test/Ice/custom/TestAMDI.h
index 080cd020f5c..26020b9ad59 100644
--- a/cpp/test/Ice/custom/TestAMDI.h
+++ b/cpp/test/Ice/custom/TestAMDI.h
@@ -12,7 +12,7 @@
 
 #include <TestAMD.h>
 
-class TestIntfI : virtual public Test::TestIntf
+class TestIntfI : public virtual Test::TestIntf
 {
 public:
 
diff --git a/cpp/test/Ice/custom/TestI.h b/cpp/test/Ice/custom/TestI.h
index 2633971229a..348c6c0bfec 100644
--- a/cpp/test/Ice/custom/TestI.h
+++ b/cpp/test/Ice/custom/TestI.h
@@ -12,7 +12,7 @@
 
 #include <Test.h>
 
-class TestIntfI : virtual public Test::TestIntf
+class TestIntfI : public virtual Test::TestIntf
 {
 public:
 
diff --git a/cpp/test/Ice/custom/WstringAMDI.h b/cpp/test/Ice/custom/WstringAMDI.h
index 3797f62801a..aecb4a8c34f 100644
--- a/cpp/test/Ice/custom/WstringAMDI.h
+++ b/cpp/test/Ice/custom/WstringAMDI.h
@@ -15,7 +15,7 @@
 namespace Test1
 {
 
-class WstringClassI : virtual public WstringClass
+class WstringClassI : public virtual WstringClass
 {
 public:
 
@@ -37,7 +37,7 @@ public:
 namespace Test2
 {
 
-class WstringClassI : virtual public WstringClass
+class WstringClassI : public virtual WstringClass
 {
 public:
 
diff --git a/cpp/test/Ice/custom/WstringI.h b/cpp/test/Ice/custom/WstringI.h
index b25a0176250..c714ccd6aab 100644
--- a/cpp/test/Ice/custom/WstringI.h
+++ b/cpp/test/Ice/custom/WstringI.h
@@ -15,7 +15,7 @@
 namespace Test1
 {
 
-class WstringClassI : virtual public WstringClass
+class WstringClassI : public virtual WstringClass
 {
 public:
 
@@ -36,7 +36,7 @@ public:
 namespace Test2
 {
 
-class WstringClassI : virtual public WstringClass
+class WstringClassI : public virtual WstringClass
 {
 public:
 
diff --git a/cpp/test/Ice/defaultServant/TestI.h b/cpp/test/Ice/defaultServant/TestI.h
index bf219f96182..6c08d44c88c 100644
--- a/cpp/test/Ice/defaultServant/TestI.h
+++ b/cpp/test/Ice/defaultServant/TestI.h
@@ -12,7 +12,7 @@
 
 #include <Test.h>
 
-class MyObjectI : virtual public Test::MyObject
+class MyObjectI : public virtual Test::MyObject
 {
 public:
 
diff --git a/cpp/test/Ice/dispatcher/TestI.h b/cpp/test/Ice/dispatcher/TestI.h
index 4018d596ee6..f645036bde7 100644
--- a/cpp/test/Ice/dispatcher/TestI.h
+++ b/cpp/test/Ice/dispatcher/TestI.h
@@ -15,7 +15,7 @@
 class TestIntfControllerI;
 ICE_DEFINE_PTR(TestIntfControllerIPtr, TestIntfControllerI);
 
-class TestIntfI : virtual public Test::TestIntf
+class TestIntfI : public virtual Test::TestIntf
 {
 public:
 
diff --git a/cpp/test/Ice/enums/TestI.h b/cpp/test/Ice/enums/TestI.h
index d0a925d6d97..bc4fed47e44 100644
--- a/cpp/test/Ice/enums/TestI.h
+++ b/cpp/test/Ice/enums/TestI.h
@@ -13,7 +13,7 @@
 #include <Test.h>
 #include <TestCommon.h>
 
-class TestIntfI : virtual public Test::TestIntf
+class TestIntfI : public virtual Test::TestIntf
 {
 public:
 
diff --git a/cpp/test/Ice/exceptions/AllTests.cpp b/cpp/test/Ice/exceptions/AllTests.cpp
index 69a9ebe662c..164cc9d65d3 100644
--- a/cpp/test/Ice/exceptions/AllTests.cpp
+++ b/cpp/test/Ice/exceptions/AllTests.cpp
@@ -21,11 +21,11 @@ const bool printException = false;
 }
 
 
-class EmptyI : virtual public Empty
+class EmptyI : public virtual Empty
 {
 };
 
-class ServantLocatorI : virtual public Ice::ServantLocator
+class ServantLocatorI : public virtual Ice::ServantLocator
 {
 public:
 
@@ -41,7 +41,7 @@ public:
 };
 
 #ifndef ICE_CPP11_MAPPING // C++98
-class ValueFactoryI : virtual public Ice::ValueFactory
+class ValueFactoryI : public virtual Ice::ValueFactory
 {
 public:
     virtual Ice::ObjectPtr create(const string&) { return 0; }
diff --git a/cpp/test/Ice/facets/AllTests.cpp b/cpp/test/Ice/facets/AllTests.cpp
index c10ba942b0a..fdbe7393984 100644
--- a/cpp/test/Ice/facets/AllTests.cpp
+++ b/cpp/test/Ice/facets/AllTests.cpp
@@ -15,7 +15,7 @@
 using namespace std;
 using namespace Test;
 
-class EmptyI : virtual public Empty
+class EmptyI : public virtual Empty
 {
 };
 
diff --git a/cpp/test/Ice/facets/TestI.h b/cpp/test/Ice/facets/TestI.h
index 8e80c526193..3aaf202ae47 100644
--- a/cpp/test/Ice/facets/TestI.h
+++ b/cpp/test/Ice/facets/TestI.h
@@ -12,49 +12,49 @@
 
 #include <Test.h>
 
-class AI : virtual public Test::A
+class AI : public virtual Test::A
 {
 public:
 
     virtual std::string callA(const Ice::Current&);
 };
 
-class BI : virtual public Test::B, virtual public AI
+class BI : public virtual Test::B, public virtual AI
 {
 public:
 
     virtual std::string callB(const Ice::Current&);
 };
 
-class CI : virtual public Test::C, virtual public AI
+class CI : public virtual Test::C, public virtual AI
 {
 public:
 
     virtual std::string callC(const Ice::Current&);
 };
 
-class DI : virtual public Test::D, virtual public BI, virtual public CI
+class DI : public virtual Test::D, public virtual BI, public virtual CI
 {
 public:
 
     virtual std::string callD(const Ice::Current&);
 };
 
-class EI : virtual public Test::E
+class EI : public virtual Test::E
 {
 public:
 
     virtual std::string callE(const Ice::Current&);
 };
 
-class FI : virtual public Test::F, virtual public EI
+class FI : public virtual Test::F, public virtual EI
 {
 public:
 
     virtual std::string callF(const Ice::Current&);
 };
 
-class GI : virtual public Test::G
+class GI : public virtual Test::G
 {
 public:
 
@@ -67,7 +67,7 @@ private:
     Ice::CommunicatorPtr _communicator;
 };
 
-class HI : virtual public Test::H, virtual public GI
+class HI : public virtual Test::H, public virtual GI
 {
 public:
 
diff --git a/cpp/test/Ice/faultTolerance/AllTests.cpp b/cpp/test/Ice/faultTolerance/AllTests.cpp
index f7af62128f3..59a35e28525 100644
--- a/cpp/test/Ice/faultTolerance/AllTests.cpp
+++ b/cpp/test/Ice/faultTolerance/AllTests.cpp
@@ -52,7 +52,7 @@ private:
     bool _called;
 };
 
-class Callback : virtual public IceUtil::Shared, virtual public CallbackBase
+class Callback : public virtual IceUtil::Shared, public virtual CallbackBase
 {
 public:
 
diff --git a/cpp/test/Ice/inheritance/TestI.h b/cpp/test/Ice/inheritance/TestI.h
index aba8de29de6..7c841b15dc7 100644
--- a/cpp/test/Ice/inheritance/TestI.h
+++ b/cpp/test/Ice/inheritance/TestI.h
@@ -43,113 +43,113 @@ private:
 };
 
 #ifdef ICE_CPP11_MAPPING
-class CAI_ : virtual public Test::MA::CADisp
+class CAI_ : public virtual Test::MA::CADisp
 {
 public:
 
     virtual std::shared_ptr<Test::MA::CAPrx> caop(std::shared_ptr<Test::MA::CAPrx>, const Ice::Current&);
 };
 
-class CBI : virtual public Test::MB::CBDisp, virtual public CAI_
+class CBI : public virtual Test::MB::CBDisp, public virtual CAI_
 {
 public:
 
     virtual std::shared_ptr<Test::MB::CBPrx> cbop(std::shared_ptr<Test::MB::CBPrx>, const Ice::Current&);
 };
 
-class CCI : virtual public Test::MA::CCDisp, virtual public CBI
+class CCI : public virtual Test::MA::CCDisp, public virtual CBI
 {
 public:
 
     virtual std::shared_ptr<Test::MA::CCPrx> ccop(std::shared_ptr<Test::MA::CCPrx>, const Ice::Current&);
 };
 
-class IAI : virtual public Test::MA::IA
+class IAI : public virtual Test::MA::IA
 {
 public:
 
     virtual std::shared_ptr<Test::MA::IAPrx> iaop(std::shared_ptr<Test::MA::IAPrx>, const Ice::Current&);
 };
 
-class IB1I : virtual public Test::MB::IB1,
-             virtual public IAI
+class IB1I : public virtual Test::MB::IB1,
+             public virtual IAI
 {
 public:
 
     virtual std::shared_ptr<Test::MB::IB1Prx> ib1op(std::shared_ptr<Test::MB::IB1Prx>, const Ice::Current&);
 };
 
-class IB2I : virtual public Test::MB::IB2, virtual public IAI
+class IB2I : public virtual Test::MB::IB2, public virtual IAI
 {
 public:
 
     virtual std::shared_ptr<Test::MB::IB2Prx> ib2op(std::shared_ptr<Test::MB::IB2Prx>, const Ice::Current&);
 };
 
-class ICI : virtual public Test::MA::IC, virtual public IB1I, virtual public IB2I
+class ICI : public virtual Test::MA::IC, public virtual IB1I, public virtual IB2I
 {
 public:
 
     virtual std::shared_ptr<Test::MA::ICPrx> icop(std::shared_ptr<Test::MA::ICPrx>, const Ice::Current&);
 };
 
-class CDI : virtual public Test::MA::CDDisp, virtual public CCI, virtual public IB1I, virtual public IB2I
+class CDI : public virtual Test::MA::CDDisp, public virtual CCI, public virtual IB1I, public virtual IB2I
 {
 public:
 
     virtual std::shared_ptr<Test::MA::CDPrx> cdop(std::shared_ptr<Test::MA::CDPrx>, const Ice::Current&);
 };
 #else
-class CAI_ : virtual public Test::MA::CA
+class CAI_ : public virtual Test::MA::CA
 {
 public:
 
     virtual Test::MA::CAPrx caop(const Test::MA::CAPrx&, const Ice::Current&);
 };
 
-class CBI : virtual public Test::MB::CB, virtual public CAI_
+class CBI : public virtual Test::MB::CB, public virtual CAI_
 {
 public:
 
     virtual Test::MB::CBPrx cbop(const Test::MB::CBPrx&, const Ice::Current&);
 };
 
-class CCI : virtual public Test::MA::CC, virtual public CBI
+class CCI : public virtual Test::MA::CC, public virtual CBI
 {
 public:
 
     virtual Test::MA::CCPrx ccop(const Test::MA::CCPrx&, const Ice::Current&);
 };
 
-class IAI : virtual public Test::MA::IA
+class IAI : public virtual Test::MA::IA
 {
 public:
 
     virtual Test::MA::IAPrx iaop(const Test::MA::IAPrx&, const Ice::Current&);
 };
 
-class IB1I : virtual public Test::MB::IB1, virtual public IAI
+class IB1I : public virtual Test::MB::IB1, public virtual IAI
 {
 public:
 
     virtual Test::MB::IB1Prx ib1op(const Test::MB::IB1Prx&, const Ice::Current&);                  
 };
 
-class IB2I : virtual public Test::MB::IB2, virtual public IAI
+class IB2I : public virtual Test::MB::IB2, public virtual IAI
 {
 public:
 
     virtual Test::MB::IB2Prx ib2op(const Test::MB::IB2Prx&, const Ice::Current&);
 };
 
-class ICI : virtual public Test::MA::IC, virtual public IB1I, virtual public IB2I
+class ICI : public virtual Test::MA::IC, public virtual IB1I, public virtual IB2I
 {
 public:
 
     virtual Test::MA::ICPrx icop(const Test::MA::ICPrx&, const Ice::Current&);
 };
 
-class CDI : virtual public Test::MA::CD, virtual public CCI, virtual public IB1I, virtual public IB2I
+class CDI : public virtual Test::MA::CD, public virtual CCI, public virtual IB1I, public virtual IB2I
 {
 public:
 
diff --git a/cpp/test/Ice/location/AllTests.cpp b/cpp/test/Ice/location/AllTests.cpp
index 5a751c0dc86..795a0e0c7bd 100644
--- a/cpp/test/Ice/location/AllTests.cpp
+++ b/cpp/test/Ice/location/AllTests.cpp
@@ -17,7 +17,7 @@
 using namespace std;
 using namespace Test;
 
-class HelloI : virtual public Hello
+class HelloI : public virtual Hello
 {
 public:
     
diff --git a/cpp/test/Ice/metrics/InstrumentationI.h b/cpp/test/Ice/metrics/InstrumentationI.h
index 00e20bd06f5..b21a5e0b855 100644
--- a/cpp/test/Ice/metrics/InstrumentationI.h
+++ b/cpp/test/Ice/metrics/InstrumentationI.h
@@ -12,7 +12,7 @@
 
 #include <Ice/Instrumentation.h>
 
-class ObserverI : virtual public Ice::Instrumentation::Observer, public IceUtil::Mutex
+class ObserverI : public virtual Ice::Instrumentation::Observer, public IceUtil::Mutex
 {
 public:
 
@@ -159,7 +159,7 @@ public:
 };
 ICE_DEFINE_PTR(DispatchObserverIPtr, DispatchObserverI);
 
-class ChildInvocationObserverI : virtual public Ice::Instrumentation::ChildInvocationObserver, public ObserverI
+class ChildInvocationObserverI : public virtual Ice::Instrumentation::ChildInvocationObserver, public ObserverI
 {
 public:
 
diff --git a/cpp/test/Ice/slicing/exceptions/TestAMDI.h b/cpp/test/Ice/slicing/exceptions/TestAMDI.h
index 89998a9f252..100a89d2f2a 100644
--- a/cpp/test/Ice/slicing/exceptions/TestAMDI.h
+++ b/cpp/test/Ice/slicing/exceptions/TestAMDI.h
@@ -12,7 +12,7 @@
 
 #include <ServerPrivateAMD.h>
 
-class TestI : virtual public Test::TestIntf
+class TestI : public virtual Test::TestIntf
 {
 public:
 
diff --git a/cpp/test/Ice/slicing/exceptions/TestI.h b/cpp/test/Ice/slicing/exceptions/TestI.h
index e3884e9d9f0..cd03722f846 100644
--- a/cpp/test/Ice/slicing/exceptions/TestI.h
+++ b/cpp/test/Ice/slicing/exceptions/TestI.h
@@ -13,7 +13,7 @@
 #include <ServerPrivate.h>
 #include <TestCommon.h>
 
-class TestI : virtual public Test::TestIntf
+class TestI : public virtual Test::TestIntf
 {
 public:
 
diff --git a/cpp/test/Ice/slicing/objects/AllTests.cpp b/cpp/test/Ice/slicing/objects/AllTests.cpp
index 512ac967ae0..8becb365bd4 100644
--- a/cpp/test/Ice/slicing/objects/AllTests.cpp
+++ b/cpp/test/Ice/slicing/objects/AllTests.cpp
@@ -489,7 +489,7 @@ public:
 };
 ICE_DEFINE_PTR(CallbackPtr, Callback);
 
-class PNodeI : virtual public PNode
+class PNodeI : public virtual PNode
 {
 public:
 
@@ -528,7 +528,7 @@ public:
 };
 #endif
 
-class PreservedI : virtual public Preserved
+class PreservedI : public virtual Preserved
 {
 public:
 
diff --git a/cpp/test/Ice/slicing/objects/TestAMDI.h b/cpp/test/Ice/slicing/objects/TestAMDI.h
index afce6719753..f2dd3dafc37 100644
--- a/cpp/test/Ice/slicing/objects/TestAMDI.h
+++ b/cpp/test/Ice/slicing/objects/TestAMDI.h
@@ -12,7 +12,7 @@
 
 #include <ServerPrivateAMD.h>
 
-class TestI : virtual public ::Test::TestIntf
+class TestI : public virtual ::Test::TestIntf
 {
 public:
 
diff --git a/cpp/test/Ice/slicing/objects/TestI.h b/cpp/test/Ice/slicing/objects/TestI.h
index 31c952e0ae2..313c94ecbc6 100644
--- a/cpp/test/Ice/slicing/objects/TestI.h
+++ b/cpp/test/Ice/slicing/objects/TestI.h
@@ -13,7 +13,7 @@
 #include <ServerPrivate.h>
 #include <TestCommon.h>
 
-class TestI : virtual public Test::TestIntf
+class TestI : public virtual Test::TestIntf
 {
 public:
 
diff --git a/cpp/test/Ice/timeout/TestI.h b/cpp/test/Ice/timeout/TestI.h
index 494d53832ac..a3d19387f38 100644
--- a/cpp/test/Ice/timeout/TestI.h
+++ b/cpp/test/Ice/timeout/TestI.h
@@ -13,7 +13,7 @@
 #include <Test.h>
 #include <TestCommon.h>
 
-class TimeoutI : virtual public Test::Timeout
+class TimeoutI : public virtual Test::Timeout
 {
 public:
 
diff --git a/cpp/test/IceBox/admin/TestI.h b/cpp/test/IceBox/admin/TestI.h
index 11322fe56fa..7c6ab1a58f1 100644
--- a/cpp/test/IceBox/admin/TestI.h
+++ b/cpp/test/IceBox/admin/TestI.h
@@ -12,8 +12,8 @@
 
 #include <Test.h>
 
-class TestFacetI : virtual public ::Test::TestFacet,
-                   virtual public Ice::PropertiesAdminUpdateCallback,
+class TestFacetI : public virtual ::Test::TestFacet,
+                   public virtual Ice::PropertiesAdminUpdateCallback,
                    IceUtil::Monitor<IceUtil::Mutex>
 {
 public:
diff --git a/cpp/test/IceGrid/allocation/AllTests.cpp b/cpp/test/IceGrid/allocation/AllTests.cpp
index bf326d4a2c4..2d27fca16eb 100644
--- a/cpp/test/IceGrid/allocation/AllTests.cpp
+++ b/cpp/test/IceGrid/allocation/AllTests.cpp
@@ -19,7 +19,7 @@ using namespace std;
 using namespace Test;
 using namespace IceGrid;
 
-class Callback : public IceUtil::Monitor<IceUtil::Mutex>, virtual public IceUtil::Shared
+class Callback : public IceUtil::Monitor<IceUtil::Mutex>, public virtual IceUtil::Shared
 {
 public: