summaryrefslogtreecommitdiff
path: root/cpp/demo/book/lifecycle/Server.cpp
diff options
context:
space:
mode:
authorBernard Normier <bernard@zeroc.com>2014-05-09 16:19:26 -0400
committerBernard Normier <bernard@zeroc.com>2014-05-09 16:19:26 -0400
commit0c7a4a5667b8a5240c5bd943f77d122c77254c89 (patch)
treea5e6896a60d0d3cb28a152b0f290867d142f5a59 /cpp/demo/book/lifecycle/Server.cpp
parentFixed small bug in WindowsStringConverter::fromUTF8 introduced in previous co... (diff)
downloadice-0c7a4a5667b8a5240c5bd943f77d122c77254c89.tar.bz2
ice-0c7a4a5667b8a5240c5bd943f77d122c77254c89.tar.xz
ice-0c7a4a5667b8a5240c5bd943f77d122c77254c89.zip
Fixed ICE-5374: removed erroneous virtual inheritance from various demos
Diffstat (limited to 'cpp/demo/book/lifecycle/Server.cpp')
-rw-r--r--cpp/demo/book/lifecycle/Server.cpp2
1 files changed, 1 insertions, 1 deletions
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: