[asterisk-scf-commits] asterisk-scf/integration/servicediscover.git branch "retry_deux" updated.
Commits to the Asterisk SCF project code repositories
asterisk-scf-commits at lists.digium.com
Mon Mar 5 09:21:22 CST 2012
branch "retry_deux" has been updated
via ede106cd7214bf79c06ee2d0567e7a10c4ca9b0e (commit)
from 18067f50f298bc5f9033d93f62f2799c7dfe0b22 (commit)
Summary of changes:
src/ServiceLocator.cpp | 2 +-
src/ServiceLocatorManagement.cpp | 2 +-
src/ServiceLocatorStateListener.cpp | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
- Log -----------------------------------------------------------------
commit ede106cd7214bf79c06ee2d0567e7a10c4ca9b0e
Author: Brent Eagles <beagles at digium.com>
Date: Mon Mar 5 11:50:26 2012 -0330
Some more build fixes.
diff --git a/src/ServiceLocator.cpp b/src/ServiceLocator.cpp
index fe1241a..6c725ee 100644
--- a/src/ServiceLocator.cpp
+++ b/src/ServiceLocator.cpp
@@ -268,7 +268,7 @@ void ServiceLocatorApp::start(const string& appName, const Ice::CommunicatorPtr&
if (getBooleanPropertyValueWithDefault(communicator->getProperties(), appName + ".Standalone", false))
{
mReplicaService->standby(AsteriskSCF::Operations::createContext());
- mStateReplicator->addListener(replicatorListenerProxy);
+ mStateReplicator->addListener(AsteriskSCF::Operations::createContext(), replicatorListenerProxy);
lg(Info) << "Operating as a standby replica." << endl;
}
else
diff --git a/src/ServiceLocatorManagement.cpp b/src/ServiceLocatorManagement.cpp
index b8e6312..a04fd3f 100644
--- a/src/ServiceLocatorManagement.cpp
+++ b/src/ServiceLocatorManagement.cpp
@@ -618,7 +618,7 @@ void ServiceLocatorManagementImpl::replicateState(const ServiceLocatorStateItemP
try
{
ServiceLocatorStateReplicatorPrx oneway = ServiceLocatorStateReplicatorPrx::uncheckedCast(mImpl->mStateReplicator->ice_oneway());
- oneway->setState(AsteriskSCF::Operations:::createContext(), items);
+ oneway->setState(AsteriskSCF::Operations::createContext(), items);
}
catch (const Ice::NoEndpointException&)
{
diff --git a/src/ServiceLocatorStateListener.cpp b/src/ServiceLocatorStateListener.cpp
index af7e5ac..fbc6bf4 100644
--- a/src/ServiceLocatorStateListener.cpp
+++ b/src/ServiceLocatorStateListener.cpp
@@ -185,12 +185,12 @@ ServiceLocatorStateReplicatorListenerI::ServiceLocatorStateReplicatorListenerI(c
{
}
-void ServiceLocatorStateReplicatorListenerI::stateRemoved(const Ice::StringSeq& itemKeys, const Ice::Current&)
+void ServiceLocatorStateReplicatorListenerI::stateRemoved(const AsteriskSCF::System::V1::OperationContextPtr&, const Ice::StringSeq& itemKeys, const Ice::Current&)
{
mImpl->removeStateNoticeImpl(itemKeys);
}
-void ServiceLocatorStateReplicatorListenerI::stateSet(const ServiceLocatorStateItemSeq& items, const Ice::Current&)
+void ServiceLocatorStateReplicatorListenerI::stateSet(const AsteriskSCF::System::V1::OperationContextPtr&, const ServiceLocatorStateItemSeq& items, const Ice::Current&)
{
mImpl->setStateNoticeImpl(items);
}
-----------------------------------------------------------------------
--
asterisk-scf/integration/servicediscover.git
More information about the asterisk-scf-commits
mailing list