diff options
author | Jose <jose@zeroc.com> | 2015-12-07 21:08:51 +0100 |
---|---|---|
committer | Jose <jose@zeroc.com> | 2015-12-07 21:08:51 +0100 |
commit | acb6c5333de462e29d21166057fc074a815f2e3d (patch) | |
tree | 9acad37c34ef7b503f3aac13ea1858f1c965946c /cpp/test/Ice/plugin/Client.cpp | |
parent | ICE-6897 - Add delegate metadata (diff) | |
download | ice-acb6c5333de462e29d21166057fc074a815f2e3d.tar.bz2 ice-acb6c5333de462e29d21166057fc074a815f2e3d.tar.xz ice-acb6c5333de462e29d21166057fc074a815f2e3d.zip |
C++11 mapping updates:
- Added missing __hash method
- Added missing virtual method Value::ice_clone
- Fixed issue with unmarshalling the idirection table
- Fixed default value initialization for scoped enums
- Fixed scoped enums mapping to use correct size types
- Added missing ice_id method to generated Value classes
- Fixed defaultValue, hash, networkProxy, plug-in,
stringConverter, threadPoolPriority and slicing/objects
tests to work with C++11 mapping
Diffstat (limited to 'cpp/test/Ice/plugin/Client.cpp')
-rw-r--r-- | cpp/test/Ice/plugin/Client.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/cpp/test/Ice/plugin/Client.cpp b/cpp/test/Ice/plugin/Client.cpp index d35ee1c53d9..47f2ea339c4 100644 --- a/cpp/test/Ice/plugin/Client.cpp +++ b/cpp/test/Ice/plugin/Client.cpp @@ -63,7 +63,7 @@ private: bool _initialized; bool _destroyed; }; -typedef IceUtil::Handle<MyPlugin> MyPluginPtr; +ICE_DEFINE_PTR(MyPluginPtr, MyPlugin); } @@ -91,7 +91,7 @@ main(int argc, char* argv[]) try { communicator = Ice::initialize(argc, argv); - MyPluginPtr plugin = MyPluginPtr::dynamicCast(communicator->getPluginManager()->getPlugin("Static1")); + MyPluginPtr plugin = ICE_DYNAMIC_CAST(MyPlugin, communicator->getPluginManager()->getPlugin("Static1")); test(plugin && plugin->isInitialized()); try { @@ -113,9 +113,9 @@ main(int argc, char* argv[]) initData.properties = Ice::createProperties(argc, argv); initData.properties->setProperty("Ice.Plugin.Static2", "1"); communicator = Ice::initialize(argc, argv, initData); - MyPluginPtr plugin = MyPluginPtr::dynamicCast(communicator->getPluginManager()->getPlugin("Static1")); + MyPluginPtr plugin = ICE_DYNAMIC_CAST(MyPlugin, communicator->getPluginManager()->getPlugin("Static1")); test(plugin && plugin->isInitialized()); - plugin = MyPluginPtr::dynamicCast(communicator->getPluginManager()->getPlugin("Static2")); + plugin = ICE_DYNAMIC_CAST(MyPlugin, communicator->getPluginManager()->getPlugin("Static2")); test(plugin && plugin->isInitialized()); communicator->destroy(); } @@ -266,7 +266,7 @@ main(int argc, char* argv[]) test(pm->getPlugin("PluginTwo")); test(pm->getPlugin("PluginThree")); - MyPluginPtr p4 = new MyPlugin; + MyPluginPtr p4 = ICE_MAKE_SHARED(MyPlugin); pm->addPlugin("PluginFour", p4); test(pm->getPlugin("PluginFour")); |