10 files changed, 18 insertions, 15 deletions
diff --git a/cpp/demo/Ice/async/HelloI.h b/cpp/demo/Ice/async/HelloI.h
index 2efd6922e92..0d1bedefe8b 100644
--- a/cpp/demo/Ice/async/HelloI.h
+++ b/cpp/demo/Ice/async/HelloI.h
@@ -13,7 +13,7 @@
 #include <Hello.h>
 #include <WorkQueue.h>
 
-class HelloI : virtual public Demo::Hello
+class HelloI : public Demo::Hello
 {
 public:
 
diff --git a/cpp/demo/Ice/invoke/PrinterI.h b/cpp/demo/Ice/invoke/PrinterI.h
index 5d8323c3360..b0f8bd803eb 100644
--- a/cpp/demo/Ice/invoke/PrinterI.h
+++ b/cpp/demo/Ice/invoke/PrinterI.h
@@ -12,7 +12,7 @@
 
 #include <Printer.h>
 
-class PrinterI : virtual public Ice::Blobject
+class PrinterI : public Ice::Blobject
 {
 public:
 
diff --git a/cpp/demo/Ice/value/ValueI.h b/cpp/demo/Ice/value/ValueI.h
index e600f062203..c79b046d29b 100644
--- a/cpp/demo/Ice/value/ValueI.h
+++ b/cpp/demo/Ice/value/ValueI.h
@@ -33,6 +33,9 @@ private:
     const Demo::DerivedPrinterPtr _derivedPrinter;
 };
 
+//
+// Virtual inheritance because we plan to reuse this implementation in DerivedPrinterI
+//
 class PrinterI : virtual public Demo::Printer
 {
 public:
@@ -40,14 +43,14 @@ public:
     virtual void printBackwards(const Ice::Current&);
 };
 
-class DerivedPrinterI : virtual public Demo::DerivedPrinter, virtual public PrinterI
+class DerivedPrinterI : public Demo::DerivedPrinter, public PrinterI
 {
 public:
 
     virtual void printUppercase(const Ice::Current&);
 };
 
-class ClientPrinterI : virtual public Demo::ClientPrinter, virtual public PrinterI
+class ClientPrinterI : public Demo::ClientPrinter, public PrinterI
 {
 };
 
diff --git a/cpp/demo/book/evictor_filesystem/PersistentFilesystemI.h b/cpp/demo/book/evictor_filesystem/PersistentFilesystemI.h
index 6edfdf32306..19c123cdead 100644
--- a/cpp/demo/book/evictor_filesystem/PersistentFilesystemI.h
+++ b/cpp/demo/book/evictor_filesystem/PersistentFilesystemI.h
@@ -17,7 +17,7 @@
 namespace Filesystem
 {
 
-class FileI : virtual public PersistentFile
+class FileI : public PersistentFile
 {
 public:
 
@@ -37,7 +37,7 @@ private:
     IceUtil::Mutex _mutex;
 };
 
-class DirectoryI : virtual public PersistentDirectory
+class DirectoryI : public PersistentDirectory
 {
 public:
 
@@ -60,7 +60,7 @@ public:
     IceUtil::Mutex _mutex;
 };
 
-class NodeFactory : virtual public Ice::ObjectFactory
+class NodeFactory : public Ice::ObjectFactory
 {
 public:
 
diff --git a/cpp/demo/book/evictor_filesystem/Server.cpp b/cpp/demo/book/evictor_filesystem/Server.cpp
index 6173fce4ee6..7ff0eefb4b3 100644
--- a/cpp/demo/book/evictor_filesystem/Server.cpp
+++ b/cpp/demo/book/evictor_filesystem/Server.cpp
@@ -12,7 +12,7 @@
 using namespace std;
 using namespace Filesystem;
 
-class FilesystemApp : virtual public Ice::Application
+class FilesystemApp : public Ice::Application
 {
 public:
 
diff --git a/cpp/demo/book/lifecycle/FilesystemI.h b/cpp/demo/book/lifecycle/FilesystemI.h
index 0f6bd47d77e..c2d99b30645 100644
--- a/cpp/demo/book/lifecycle/FilesystemI.h
+++ b/cpp/demo/book/lifecycle/FilesystemI.h
@@ -39,7 +39,7 @@ namespace FilesystemI
     };
     typedef IceUtil::Handle<NodeI> NodeIPtr;
 
-    class FileI : virtual public Filesystem::File, virtual public NodeI
+    class FileI : public Filesystem::File, public NodeI
     {
     public:
 
@@ -55,7 +55,7 @@ namespace FilesystemI
     };
     typedef IceUtil::Handle<FileI> FileIPtr;
 
-    class DirectoryI : virtual public NodeI, virtual public Filesystem::Directory
+    class DirectoryI :  public NodeI, public Filesystem::Directory
     {
     public:
 
diff --git a/cpp/demo/book/lifecycle/Server.cpp b/cpp/demo/book/lifecycle/Server.cpp
index 8a093394b73..6654c4cda31 100644
--- a/cpp/demo/book/lifecycle/Server.cpp
+++ b/cpp/demo/book/lifecycle/Server.cpp
@@ -14,7 +14,7 @@ using namespace std;
 using namespace Filesystem;
 using namespace FilesystemI;
 
-class FilesystemApp : virtual public Ice::Application
+class FilesystemApp : public Ice::Application
 {
 public:
 
diff --git a/cpp/demo/book/map_filesystem/Server.cpp b/cpp/demo/book/map_filesystem/Server.cpp
index c1840c78e83..2b8bf2089eb 100644
--- a/cpp/demo/book/map_filesystem/Server.cpp
+++ b/cpp/demo/book/map_filesystem/Server.cpp
@@ -17,7 +17,7 @@ using namespace std;
 using namespace Filesystem;
 using namespace FilesystemDB;
 
-class FilesystemApp : public virtual Ice::Application
+class FilesystemApp : public Ice::Application
 {
 public:
 
diff --git a/cpp/demo/book/simple_filesystem/FilesystemI.h b/cpp/demo/book/simple_filesystem/FilesystemI.h
index 4398069d8c1..7e7fc35d59c 100644
--- a/cpp/demo/book/simple_filesystem/FilesystemI.h
+++ b/cpp/demo/book/simple_filesystem/FilesystemI.h
@@ -36,7 +36,7 @@ namespace Filesystem
     };
     typedef IceUtil::Handle<NodeI> NodeIPtr;
 
-    class FileI : virtual public File, virtual public NodeI
+    class FileI : public File, public NodeI
     {
     public:
 
@@ -51,7 +51,7 @@ namespace Filesystem
     };
     typedef IceUtil::Handle<FileI> FileIPtr;
 
-    class DirectoryI : virtual public Directory, virtual public NodeI
+    class DirectoryI : public Directory, public NodeI
     {
     public:
 
diff --git a/cpp/demo/book/simple_filesystem/Server.cpp b/cpp/demo/book/simple_filesystem/Server.cpp
index f2d1b94bd5d..e57906a2c29 100644
--- a/cpp/demo/book/simple_filesystem/Server.cpp
+++ b/cpp/demo/book/simple_filesystem/Server.cpp
@@ -13,7 +13,7 @@
 using namespace std;
 using namespace Filesystem;
 
-class FilesystemApp : virtual public Ice::Application
+class FilesystemApp : public Ice::Application
 {
 public: