diff options
| author | Jan Klass <kissaki@posteo.de> | 2017-10-02 02:50:51 +0300 |
|---|---|---|
| committer | Jan Klass <kissaki@posteo.de> | 2017-10-02 03:12:00 +0300 |
| commit | 264d1edd9e7eeee5cc7187052c963eae1965dc29 (patch) | |
| tree | edf8a15eeda836d6779e1fc883a74b2d2f4f2c2a /src/murmur/MurmurIce.cpp | |
| parent | 387fc014b1d78c420cd0ee676ac6255475fdc446 (diff) | |
Replace obsolete Ice statements for Ice >= 3.7
The Exceptions method ice_name() has been replaced by the new method
ice_id().
The Communicators method stringToIdentity has been made obsolete in favor
of a static function in the Ice namespace.
https://doc.zeroc.com/display/Ice37/Ice-Communicator#Ice-Communicator-stringToIdentity
https://doc.zeroc.com/pages/viewpage.action?pageId=18255295
https://doc.zeroc.com/pages/viewpage.action?pageId=18255344
Diffstat (limited to 'src/murmur/MurmurIce.cpp')
| -rw-r--r-- | src/murmur/MurmurIce.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/murmur/MurmurIce.cpp b/src/murmur/MurmurIce.cpp index f6f470a6c..cf858a211 100644 --- a/src/murmur/MurmurIce.cpp +++ b/src/murmur/MurmurIce.cpp @@ -252,7 +252,11 @@ MurmurIce::MurmurIce() { } adapter = communicator->createObjectAdapterWithEndpoints("Murmur", qPrintable(meta->mp.qsIceEndpoint)); MetaPtr m = new MetaI; +#if ICE_INT_VERSION >= 30700 + MetaPrx mprx = MetaPrx::uncheckedCast(adapter->add(m, Ice::stringToIdentity("Meta"))); +#else MetaPrx mprx = MetaPrx::uncheckedCast(adapter->add(m, communicator->stringToIdentity("Meta"))); +#endif adapter->addServantLocator(new ServerLocator(), "s"); iopServer = new ServerI; @@ -264,7 +268,11 @@ MurmurIce::MurmurIce() { meta->connectListener(this); } catch (Ice::Exception &e) { +#if ICE_INT_VERSION >= 30700 + qCritical("MurmurIce: Initialization failed: %s", qPrintable(u8(e.ice_id()))); +#else qCritical("MurmurIce: Initialization failed: %s", qPrintable(u8(e.ice_name()))); +#endif } } |