summaryrefslogtreecommitdiff
path: root/cpp/demo/Ice/async/HelloI.h
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/Ice/async/HelloI.h
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/Ice/async/HelloI.h')
-rw-r--r--cpp/demo/Ice/async/HelloI.h2
1 files changed, 1 insertions, 1 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: