[asterisk-scf-commits] asterisk-scf/release/bridging.git branch "master" updated.
Commits to the Asterisk SCF project code repositories
asterisk-scf-commits at lists.digium.com
Fri Apr 15 09:10:30 CDT 2011
branch "master" has been updated
via bf4ba3621565c7ed6b02c35dea2a66255db51dcb (commit)
from 252f5aae48c75f150ddc3935a9b9a44ba74cde76 (commit)
Summary of changes:
src/BridgeImpl.cpp | 16 ++++++++--------
src/MediaSplicer.cpp | 4 ++--
src/Service.cpp | 4 ++--
test/BridgeListenerI.cpp | 8 ++++----
test/BridgeManagerListenerI.cpp | 8 ++++----
test/SessionListenerI.cpp | 24 ++++++++++++------------
test/TestBridging.cpp | 8 ++++----
7 files changed, 36 insertions(+), 36 deletions(-)
- Log -----------------------------------------------------------------
commit bf4ba3621565c7ed6b02c35dea2a66255db51dcb
Author: Kevin P. Fleming <kpfleming at digium.com>
Date: Thu Apr 14 13:25:27 2011 -0500
Minor fixes for various code constructs that trip up GCC with new warning
options enabled (-Wextra, -Wconversion, -Wformat, and others).
diff --git a/src/BridgeImpl.cpp b/src/BridgeImpl.cpp
index a637e5d..b799ca0 100755
--- a/src/BridgeImpl.cpp
+++ b/src/BridgeImpl.cpp
@@ -384,16 +384,16 @@ public:
std::for_each(sessions.begin(), sessions.end(), ConnectImpl(source));
}
- void flashed(const AsteriskSCF::SessionCommunications::V1::SessionPrx& source, const Ice::Current&)
+ void flashed(const AsteriskSCF::SessionCommunications::V1::SessionPrx&, const Ice::Current&)
{
}
- void held(const AsteriskSCF::SessionCommunications::V1::SessionPrx& source, const Ice::Current&)
+ void held(const AsteriskSCF::SessionCommunications::V1::SessionPrx&, const Ice::Current&)
{
}
- void progressing(const AsteriskSCF::SessionCommunications::V1::SessionPrx& source,
- const AsteriskSCF::SessionCommunications::V1::ResponseCodePtr& response, const Ice::Current&)
+ void progressing(const AsteriskSCF::SessionCommunications::V1::SessionPrx&,
+ const AsteriskSCF::SessionCommunications::V1::ResponseCodePtr&, const Ice::Current&)
{
}
@@ -407,7 +407,7 @@ public:
}
void stopped(const AsteriskSCF::SessionCommunications::V1::SessionPrx& source,
- const AsteriskSCF::SessionCommunications::V1::ResponseCodePtr& response, const Ice::Current& current)
+ const AsteriskSCF::SessionCommunications::V1::ResponseCodePtr& response, const Ice::Current&)
{
size_t endpointCount = mBridge->sessionStopped(source, response);
if(endpointCount < 2)
@@ -416,7 +416,7 @@ public:
}
}
- void unheld(const AsteriskSCF::SessionCommunications::V1::SessionPrx& source, const Ice::Current&)
+ void unheld(const AsteriskSCF::SessionCommunications::V1::SessionPrx&, const Ice::Current&)
{
}
@@ -545,7 +545,7 @@ void AsteriskSCF::BridgeService::BridgeImpl::addSessions(
}
void AsteriskSCF::BridgeService::BridgeImpl::removeSessions(
- const AsteriskSCF::SessionCommunications::V1::SessionSeq& sessions, const Ice::Current& current)
+ const AsteriskSCF::SessionCommunications::V1::SessionSeq& sessions, const Ice::Current&)
{
if(sessions.size() == 0)
{
@@ -888,7 +888,7 @@ void AsteriskSCF::BridgeService::BridgeImpl::sessionConnected(
size_t AsteriskSCF::BridgeService::BridgeImpl::sessionStopped(
const AsteriskSCF::SessionCommunications::V1::SessionPrx& session,
- const AsteriskSCF::SessionCommunications::V1::ResponseCodePtr& response)
+ const AsteriskSCF::SessionCommunications::V1::ResponseCodePtr&)
{
lg(Debug) << __FUNCTION__ << ": session terminated from " << session->ice_toString() ;
try
diff --git a/src/MediaSplicer.cpp b/src/MediaSplicer.cpp
index 8c5d10a..6d7b0ae 100755
--- a/src/MediaSplicer.cpp
+++ b/src/MediaSplicer.cpp
@@ -342,7 +342,7 @@ private:
return false;
}
- bool canAdapt(const Media::V1::StreamSourcePrx& source, const Media::V1::StreamSinkPrx& sink)
+ bool canAdapt(const Media::V1::StreamSourcePrx&, const Media::V1::StreamSinkPrx&)
{
//
// For the moment we are assuming two streams that can definitely talk to each other.
@@ -350,7 +350,7 @@ private:
return true;
}
- bool canAdapt(const Media::V1::StreamSinkPrx& source, const Media::V1::StreamSourcePrx& sink)
+ bool canAdapt(const Media::V1::StreamSinkPrx&, const Media::V1::StreamSourcePrx&)
{
//
// For the moment we are assuming two streams that can definitely talk to each other.
diff --git a/src/Service.cpp b/src/Service.cpp
index 4250585..11d2d50 100644
--- a/src/Service.cpp
+++ b/src/Service.cpp
@@ -160,7 +160,7 @@ BridgingApp::BridgingApp()
{
}
-void BridgingApp::start(const std::string& name, const Ice::CommunicatorPtr& communicator, const Ice::StringSeq& args)
+void BridgingApp::start(const std::string& name, const Ice::CommunicatorPtr& communicator, const Ice::StringSeq&)
{
lg(Debug) << "Launching AsteriskSCF Session-Oriented Bridging Service." ;
@@ -237,7 +237,7 @@ void BridgingApp::stop()
}
extern "C" {
-ASTERISK_SCF_ICEBOX_EXPORT ::IceBox::Service* create(Ice::CommunicatorPtr communicator)
+ASTERISK_SCF_ICEBOX_EXPORT ::IceBox::Service* create(Ice::CommunicatorPtr)
{
return new BridgingApp;
}
diff --git a/test/BridgeListenerI.cpp b/test/BridgeListenerI.cpp
index cc316af..fb6e744 100644
--- a/test/BridgeListenerI.cpp
+++ b/test/BridgeListenerI.cpp
@@ -23,26 +23,26 @@ BridgeListenerI::BridgeListenerI() :
{
}
-void BridgeListenerI::sessionsAdded(const AsteriskSCF::SessionCommunications::V1::BridgePrx&, const AsteriskSCF::SessionCommunications::V1::SessionSeq& sessions, const Ice::Current& current)
+void BridgeListenerI::sessionsAdded(const AsteriskSCF::SessionCommunications::V1::BridgePrx&, const AsteriskSCF::SessionCommunications::V1::SessionSeq& sessions, const Ice::Current&)
{
IceUtil::Monitor<IceUtil::Mutex>::Lock lock(mAddMonitor);
mAdded.insert(mAdded.end(), sessions.begin(), sessions.end());
mAddMonitor.notify();
}
-void BridgeListenerI::sessionsRemoved(const AsteriskSCF::SessionCommunications::V1::BridgePrx&, const AsteriskSCF::SessionCommunications::V1::SessionSeq& sessions, const Ice::Current& current)
+void BridgeListenerI::sessionsRemoved(const AsteriskSCF::SessionCommunications::V1::BridgePrx&, const AsteriskSCF::SessionCommunications::V1::SessionSeq& sessions, const Ice::Current&)
{
IceUtil::Monitor<IceUtil::Mutex>::Lock lock(mRemoveMonitor);
mRemoved.insert(mRemoved.end(), sessions.begin(), sessions.end());
mRemoveMonitor.notify();
}
-void BridgeListenerI::stopping(const AsteriskSCF::SessionCommunications::V1::BridgePrx&, const Ice::Current& current)
+void BridgeListenerI::stopping(const AsteriskSCF::SessionCommunications::V1::BridgePrx&, const Ice::Current&)
{
mShuttingDown = true;
}
-void BridgeListenerI::stopped(const AsteriskSCF::SessionCommunications::V1::BridgePrx&, const Ice::Current& current)
+void BridgeListenerI::stopped(const AsteriskSCF::SessionCommunications::V1::BridgePrx&, const Ice::Current&)
{
IceUtil::Monitor<IceUtil::Mutex>::Lock lock(mStateMonitor);
mStopped = true;
diff --git a/test/BridgeManagerListenerI.cpp b/test/BridgeManagerListenerI.cpp
index 2abd677..de0cf79 100644
--- a/test/BridgeManagerListenerI.cpp
+++ b/test/BridgeManagerListenerI.cpp
@@ -24,22 +24,22 @@ BridgeManagerListenerI::BridgeManagerListenerI() :
{
}
-void BridgeManagerListenerI::bridgeCreated(const AsteriskSCF::SessionCommunications::V1::BridgeManagerPrx& manager,
- const AsteriskSCF::SessionCommunications::V1::BridgePrx& bridge, const Ice::Current&)
+void BridgeManagerListenerI::bridgeCreated(const AsteriskSCF::SessionCommunications::V1::BridgeManagerPrx&,
+ const AsteriskSCF::SessionCommunications::V1::BridgePrx&, const Ice::Current&)
{
IceUtil::Monitor<IceUtil::Mutex>::Lock lock(mMonitor);
++mCreated;
mMonitor.notify();
}
-void BridgeManagerListenerI::stopped(const AsteriskSCF::SessionCommunications::V1::BridgeManagerPrx& manager, const Ice::Current&)
+void BridgeManagerListenerI::stopped(const AsteriskSCF::SessionCommunications::V1::BridgeManagerPrx&, const Ice::Current&)
{
IceUtil::Monitor<IceUtil::Mutex>::Lock lock(mMonitor);
++mStopped;
mMonitor.notify();
}
-void BridgeManagerListenerI::stopping(const AsteriskSCF::SessionCommunications::V1::BridgeManagerPrx& manager, const Ice::Current&)
+void BridgeManagerListenerI::stopping(const AsteriskSCF::SessionCommunications::V1::BridgeManagerPrx&, const Ice::Current&)
{
IceUtil::Monitor<IceUtil::Mutex>::Lock lock(mMonitor);
++mStopping;
diff --git a/test/SessionListenerI.cpp b/test/SessionListenerI.cpp
index 4d402e3..375be45 100644
--- a/test/SessionListenerI.cpp
+++ b/test/SessionListenerI.cpp
@@ -22,51 +22,51 @@ SessionListenerI::SessionListenerI() : mTerminated(0)
{
}
-void SessionListenerI::ring(const AsteriskSCF::SessionCommunications::V1::SessionPrx& session, const Ice::Current&)
+void SessionListenerI::ring(const AsteriskSCF::SessionCommunications::V1::SessionPrx&, const Ice::Current&)
{
BOOST_TEST_MESSAGE(__FUNCTION__);
}
-void SessionListenerI::connected(const AsteriskSCF::SessionCommunications::V1::SessionPrx& session, const Ice::Current&)
+void SessionListenerI::connected(const AsteriskSCF::SessionCommunications::V1::SessionPrx&, const Ice::Current&)
{
BOOST_TEST_MESSAGE(__FUNCTION__);
}
-void SessionListenerI::terminated(const AsteriskSCF::SessionCommunications::V1::SessionPrx& session,
- const AsteriskSCF::SessionCommunications::V1::ResponseCodePtr& r, const Ice::Current& current)
+void SessionListenerI::terminated(const AsteriskSCF::SessionCommunications::V1::SessionPrx&,
+ const AsteriskSCF::SessionCommunications::V1::ResponseCodePtr&, const Ice::Current&)
{
++mTerminated;
BOOST_TEST_MESSAGE(__FUNCTION__);
}
-void SessionListenerI::busy(const AsteriskSCF::SessionCommunications::V1::SessionPrx& session, const Ice::Current&)
+void SessionListenerI::busy(const AsteriskSCF::SessionCommunications::V1::SessionPrx&, const Ice::Current&)
{
BOOST_TEST_MESSAGE(__FUNCTION__);
}
-void SessionListenerI::congestion(const AsteriskSCF::SessionCommunications::V1::SessionPrx& session,
- const AsteriskSCF::SessionCommunications::V1::ResponseCodePtr& r, const Ice::Current&)
+void SessionListenerI::congestion(const AsteriskSCF::SessionCommunications::V1::SessionPrx&,
+ const AsteriskSCF::SessionCommunications::V1::ResponseCodePtr&, const Ice::Current&)
{
BOOST_TEST_MESSAGE(__FUNCTION__);
}
-void SessionListenerI::hold(const AsteriskSCF::SessionCommunications::V1::SessionPrx& session, const Ice::Current&)
+void SessionListenerI::hold(const AsteriskSCF::SessionCommunications::V1::SessionPrx&, const Ice::Current&)
{
BOOST_TEST_MESSAGE(__FUNCTION__);
}
-void SessionListenerI::unhold(const AsteriskSCF::SessionCommunications::V1::SessionPrx& session, const Ice::Current&)
+void SessionListenerI::unhold(const AsteriskSCF::SessionCommunications::V1::SessionPrx&, const Ice::Current&)
{
BOOST_TEST_MESSAGE(__FUNCTION__);
}
-void SessionListenerI::flash(const AsteriskSCF::SessionCommunications::V1::SessionPrx& session, const Ice::Current&)
+void SessionListenerI::flash(const AsteriskSCF::SessionCommunications::V1::SessionPrx&, const Ice::Current&)
{
BOOST_TEST_MESSAGE(__FUNCTION__);
}
-void SessionListenerI::progress(const AsteriskSCF::SessionCommunications::V1::SessionPrx& session,
- const AsteriskSCF::SessionCommunications::V1::ResponseCodePtr& r, const Ice::Current&)
+void SessionListenerI::progress(const AsteriskSCF::SessionCommunications::V1::SessionPrx&,
+ const AsteriskSCF::SessionCommunications::V1::ResponseCodePtr&, const Ice::Current&)
{
BOOST_TEST_MESSAGE(__FUNCTION__);
}
diff --git a/test/TestBridging.cpp b/test/TestBridging.cpp
index c55d9d4..1a68587 100644
--- a/test/TestBridging.cpp
+++ b/test/TestBridging.cpp
@@ -146,7 +146,7 @@ private:
class TestChannelWrapper
{
public:
- TestChannelWrapper(const Ice::PropertiesPtr& properties, const std::string& adapterName = "TestChannel", const std::string& id = "Test.Channel")
+ TestChannelWrapper(const Ice::PropertiesPtr& properties)
{
Ice::InitializationData initData;
initData.properties = properties;
@@ -609,7 +609,7 @@ class TestRunner : public IceUtil::Thread
public:
void run()
{
- int argc = globalTestEnvironment->argc();
+ int argc = (int) globalTestEnvironment->argc();
char** argv = globalTestEnvironment->argv();
int r = ::boost::unit_test::unit_test_main(&init_unit_test, argc, argv);
exit(r);
@@ -634,7 +634,7 @@ public:
{
}
- void start(const std::string& name, const Ice::CommunicatorPtr& communicator, const Ice::StringSeq& args)
+ void start(const std::string&, const Ice::CommunicatorPtr& communicator, const Ice::StringSeq& args)
{
globalTestEnvironment = new TestEnvironment(communicator, args);
mRunner = new TestRunner;
@@ -651,7 +651,7 @@ private:
}
extern "C" {
-ASTERISK_SCF_ICEBOX_EXPORT ::IceBox::Service* create(Ice::CommunicatorPtr communicator)
+ASTERISK_SCF_ICEBOX_EXPORT ::IceBox::Service* create(Ice::CommunicatorPtr)
{
return new TestService;
}
-----------------------------------------------------------------------
--
asterisk-scf/release/bridging.git
More information about the asterisk-scf-commits
mailing list