Skip to content
Permalink
Browse files

Merge PR #3240: Fix travis osx build; Add Ice 3.7 support

The OSX build uses brew, which has Ice 3.7 now, which changed the slice path. Add the new include path.

Ice 3.7 deprecates two functions we use, which produces deprecation warnings. As we handle warnings as errors, this fails the build. Replace the deprecated functions with their replacements, guarded by a precompiler Ice version check.
  • Loading branch information...
Kissaki committed Oct 15, 2017
2 parents f2cbebd + 264d1ed commit e03989ec0b309c4b1085bd22fbdf5ecc61067f1f
Showing with 9 additions and 1 deletion.
  1. +8 −0 src/murmur/MurmurIce.cpp
  2. +1 −1 src/murmur/murmur_ice/murmur_ice.pro
@@ -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
}
}

@@ -48,7 +48,7 @@ macx {
MUMBLE_ICE_PREFIX = $$(MUMBLE_PREFIX)/Ice-3.4.2
}
INCLUDEPATH *= $$MUMBLE_ICE_PREFIX/include/
slice.commands = $$MUMBLE_ICE_PREFIX/bin/slice2cpp --checksum -I$$MUMBLE_ICE_PREFIX/slice/ -I$$MUMBLE_ICE_PREFIX/share/slice/ ../Murmur.ice
slice.commands = $$MUMBLE_ICE_PREFIX/bin/slice2cpp --checksum -I$$MUMBLE_ICE_PREFIX/slice/ -I$$MUMBLE_ICE_PREFIX/share/slice/ -I$$MUMBLE_ICE_PREFIX/share/ice/slice ../Murmur.ice
}

unix:!macx:CONFIG(buildenv) {

0 comments on commit e03989e

Please sign in to comment.
You can’t perform that action at this time.