diff options
| author | Bernard Normier <bernard@zeroc.com> | 2014-05-12 16:30:12 -0400 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2014-05-12 16:30:12 -0400 |
| commit | 481781df658366302f14007857549cfd30e9aa94 (patch) | |
| tree | 6d5ead53317a06621cc20d540ce561bd435b4a49 /cpp/demo/Ice/properties/Server.cpp | |
| parent | Fixed problem introduced with latest fix (htons/ntohs should only be defined ... (diff) | |
| download | ice-481781df658366302f14007857549cfd30e9aa94.tar.bz2 ice-481781df658366302f14007857549cfd30e9aa94.tar.xz ice-481781df658366302f14007857549cfd30e9aa94.zip | |
Removed more unnecessary virtual inheritance from demos
Diffstat (limited to 'cpp/demo/Ice/properties/Server.cpp')
| -rw-r--r-- | cpp/demo/Ice/properties/Server.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/cpp/demo/Ice/properties/Server.cpp b/cpp/demo/Ice/properties/Server.cpp index 65534d680ab..d95a0073fcb 100644 --- a/cpp/demo/Ice/properties/Server.cpp +++ b/cpp/demo/Ice/properties/Server.cpp @@ -14,12 +14,10 @@ using namespace std; // // The servant implements the Slice interface Demo::Props as well as the -// native callback class Ice::PropertiesAdminUpdateCallback. Since both -// base classes inherit from IceUtil::Shared, the servant must use -// virtual inheritance. +// native callback class Ice::PropertiesAdminUpdateCallback. // -class PropsI : virtual public Demo::Props, - virtual public Ice::PropertiesAdminUpdateCallback, +class PropsI : public Demo::Props, + public Ice::PropertiesAdminUpdateCallback, IceUtil::Monitor<IceUtil::Mutex> { public: |