C++ Consistent usage of public virtual

31 files changed, 55 insertions, 55 deletions

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;