6 files changed, 13 insertions, 13 deletions
diff --git a/cpp/include/Ice/OutgoingAsync.h b/cpp/include/Ice/OutgoingAsync.h
index 84a11e84a4c..33e0d4b2e14 100644
--- a/cpp/include/Ice/OutgoingAsync.h
+++ b/cpp/include/Ice/OutgoingAsync.h
@@ -57,7 +57,7 @@ protected:
 // responsible for the handling of the output stream and the child
 // invocation observer.
 //
-class ICE_API OutgoingAsyncBase : virtual public OutgoingAsyncCompletionCallback,
+class ICE_API OutgoingAsyncBase : public virtual OutgoingAsyncCompletionCallback,
 #ifdef ICE_CPP11_MAPPING
                                   public std::enable_shared_from_this<OutgoingAsyncBase>
 #else
@@ -311,7 +311,7 @@ namespace IceInternal
 
 #ifdef ICE_CPP11_MAPPING
 
-class ICE_API LambdaInvoke : virtual public OutgoingAsyncCompletionCallback
+class ICE_API LambdaInvoke : public virtual OutgoingAsyncCompletionCallback
 {
 public:
 
@@ -336,7 +336,7 @@ protected:
 };
 
 template<typename Promise>
-class PromiseInvoke : virtual public OutgoingAsyncCompletionCallback
+class PromiseInvoke : public virtual OutgoingAsyncCompletionCallback
 {
 public:
 
@@ -721,7 +721,7 @@ private:
     Callback _sent;
 };
 
-class CallbackCompletion : virtual public OutgoingAsyncCompletionCallback
+class CallbackCompletion : public virtual OutgoingAsyncCompletionCallback
 {
 public:
 
diff --git a/cpp/test/Ice/ami/AllTests.cpp b/cpp/test/Ice/ami/AllTests.cpp
index 9e845bd022e..35fe85d9638 100644
--- a/cpp/test/Ice/ami/AllTests.cpp
+++ b/cpp/test/Ice/ami/AllTests.cpp
@@ -773,7 +773,7 @@ private:
 };
 typedef IceUtil::Handle<FlushExCallback> FlushExCallbackPtr;
 
-class CloseCallback : virtual public CallbackBase, virtual public Ice::CloseCallback
+class CloseCallback : public virtual CallbackBase, public virtual Ice::CloseCallback
 {
 public:
 
diff --git a/objective-c/src/Ice/ObjectI.h b/objective-c/src/Ice/ObjectI.h
index 91276c18279..857740059e2 100644
--- a/objective-c/src/Ice/ObjectI.h
+++ b/objective-c/src/Ice/ObjectI.h
@@ -21,7 +21,7 @@
 namespace IceObjC
 {
 
-class ServantWrapper : virtual public Ice::Object
+class ServantWrapper : public virtual Ice::Object
 {
 public:
 
diff --git a/php/src/php5/Operation.cpp b/php/src/php5/Operation.cpp
index ebbf863dbd5..abe19021e27 100644
--- a/php/src/php5/Operation.cpp
+++ b/php/src/php5/Operation.cpp
@@ -97,7 +97,7 @@ typedef IceUtil::Handle<OperationI> OperationIPtr;
 //
 // The base class for client-side invocations.
 //
-class Invocation : virtual public IceUtil::Shared
+class Invocation : public virtual IceUtil::Shared
 {
 public:
 
@@ -119,7 +119,7 @@ typedef IceUtil::Handle<Invocation> InvocationPtr;
 // TypedInvocation uses the information in the given operation to validate, marshal, and unmarshal
 // parameters and exceptions.
 //
-class TypedInvocation : virtual public Invocation
+class TypedInvocation : public virtual Invocation
 {
 public:
 
@@ -139,7 +139,7 @@ protected:
 //
 // A synchronous typed invocation.
 //
-class SyncTypedInvocation : virtual public TypedInvocation
+class SyncTypedInvocation : public virtual TypedInvocation
 {
 public:
 
diff --git a/php/src/php7/Operation.cpp b/php/src/php7/Operation.cpp
index 6bc99e50c1a..8bd77d66cb1 100644
--- a/php/src/php7/Operation.cpp
+++ b/php/src/php7/Operation.cpp
@@ -96,7 +96,7 @@ typedef IceUtil::Handle<OperationI> OperationIPtr;
 //
 // The base class for client-side invocations.
 //
-class Invocation : virtual public IceUtil::Shared
+class Invocation : public virtual IceUtil::Shared
 {
 public:
 
@@ -115,7 +115,7 @@ typedef IceUtil::Handle<Invocation> InvocationPtr;
 // TypedInvocation uses the information in the given operation to validate, marshal, and unmarshal
 // parameters and exceptions.
 //
-class TypedInvocation : virtual public Invocation
+class TypedInvocation : public virtual Invocation
 {
 public:
 
@@ -135,7 +135,7 @@ protected:
 //
 // A synchronous typed invocation.
 //
-class SyncTypedInvocation : virtual public TypedInvocation
+class SyncTypedInvocation : public virtual TypedInvocation
 {
 public:
 
diff --git a/python/modules/IcePy/Operation.cpp b/python/modules/IcePy/Operation.cpp
index dfc260090fb..3b51db4bdfd 100644
--- a/python/modules/IcePy/Operation.cpp
+++ b/python/modules/IcePy/Operation.cpp
@@ -97,7 +97,7 @@ typedef IceUtil::Handle<Operation> OperationPtr;
 //
 // The base class for client-side invocations.
 //
-class Invocation : virtual public IceUtil::Shared
+class Invocation : public virtual IceUtil::Shared
 {
 public: