[asterisk-scf-commits] asterisk-scf/release/media_rtp_pjmedia.git branch "master" updated.

[Commits to the Asterisk SCF project code repositories]

branch "master" has been updated
       via  7e3d172b518669dff018e3177ceb2b13cf80a3b8 (commit)
      from  bd6452ec09f440b872d99b2b56b818d0b816ff78 (commit)

Summary of changes:
 src/RtpStateReplicatorListener.cpp |   22 +++++++++++-----------
 test/TestRTPpjmedia.cpp            |   12 ++++++------
 2 files changed, 17 insertions(+), 17 deletions(-)


- Log -----------------------------------------------------------------
commit 7e3d172b518669dff018e3177ceb2b13cf80a3b8
Author: Kevin P. Fleming <kpfleming at digium.com>
Date:   Tue Apr 12 16:35:19 2011 -0500

    Resolve some variable shadowing warnings.

diff --git a/src/RtpStateReplicatorListener.cpp b/src/RtpStateReplicatorListener.cpp
index b47f408..b342b7f 100644
--- a/src/RtpStateReplicatorListener.cpp
+++ b/src/RtpStateReplicatorListener.cpp
@@ -73,31 +73,31 @@ public:
 	class visitor : public AsteriskSCF::Media::RTP::V1::RtpStateItemVisitor
 	{
 	public:
-            visitor(RtpStateReplicatorListenerImpl *impl) : impl(impl)
+            visitor(RtpStateReplicatorListenerImpl *impl) : mImpl(impl)
 	    {
 	    }
 
 	private:
-	    RtpStateReplicatorListenerImpl *impl;
+	    RtpStateReplicatorListenerImpl *mImpl;
 
 	    void visitGeneral(const RtpGeneralStateItemPtr &item, const Ice::Current &)
 	    {
-		impl->mGeneralState->mServiceManagement = item->mServiceManagement;
+		mImpl->mGeneralState->mServiceManagement = item->mServiceManagement;
 	    }
 		    
 	    void visitSession(const RtpSessionStateItemPtr &item, const Ice::Current &)
 	    {
-		map<string, boost::shared_ptr<RtpStateReplicatorItem> >::iterator i = impl->mStateItems.find(item->mSessionId);
+		map<string, boost::shared_ptr<RtpStateReplicatorItem> >::iterator i = mImpl->mStateItems.find(item->mSessionId);
 		boost::shared_ptr<RtpStateReplicatorItem> localitem;
 
-		if (i == impl->mStateItems.end())
+		if (i == mImpl->mStateItems.end())
 		{
 		    boost::shared_ptr<RtpStateReplicatorItem> newitem(new RtpStateReplicatorItem());
 		    localitem = newitem;
-		    impl->mStateItems.insert(make_pair(item->mSessionId, newitem));
+		    mImpl->mStateItems.insert(make_pair(item->mSessionId, newitem));
 
 		    RTPSessionImplPtr localSession =
-                        new RTPSessionImpl(impl->mAdapter, impl->mPoolFactory, item->mSessionIdentity,
+                        new RTPSessionImpl(mImpl->mAdapter, mImpl->mPoolFactory, item->mSessionIdentity,
                                 item->mSinkIdentity, item->mSourceIdentity, item->mPort, item->mFormats);
 		    localitem->setSession(localSession);
 		}
@@ -112,8 +112,8 @@ public:
 	    void visitStreamSink(const RtpStreamSinkStateItemPtr &item, const Ice::Current &)
 	    {
 		map<string, boost::shared_ptr<RtpStateReplicatorItem> >::iterator i =
-                    impl->mStateItems.find(item->mSessionId);
-		if (i != impl->mStateItems.end())
+                    mImpl->mStateItems.find(item->mSessionId);
+		if (i != mImpl->mStateItems.end())
 		{
 		    i->second->getSession()->getSink()->setSource(item->mSource, Ice::Current());
 		    i->second->getSession()->getSink()->setRemoteDetails(item->mRemoteAddress, item->mRemotePort,
@@ -124,8 +124,8 @@ public:
 	    void visitStreamSource(const RtpStreamSourceStateItemPtr &item, const Ice::Current &)
 	    {
 		map<string, boost::shared_ptr<RtpStateReplicatorItem> >::iterator i =
-                    impl->mStateItems.find(item->mSessionId);
-		if (i != impl->mStateItems.end())
+                    mImpl->mStateItems.find(item->mSessionId);
+		if (i != mImpl->mStateItems.end())
 		{
 		    i->second->getSession()->getSource()->setSink(item->mSink, Ice::Current());
 		}
diff --git a/test/TestRTPpjmedia.cpp b/test/TestRTPpjmedia.cpp
index f03cb72..2195a90 100644
--- a/test/TestRTPpjmedia.cpp
+++ b/test/TestRTPpjmedia.cpp
@@ -144,37 +144,37 @@ void TestRtpReplicatorListener::stateSet(const RtpStateItemSeq& items, const Ice
     class visitor : public AsteriskSCF::Media::RTP::V1::RtpStateItemVisitor
     {
     public:
-        visitor(TestRtpReplicatorListener *listener) : listener(listener)
+        visitor(TestRtpReplicatorListener *listener) : mListener(listener)
 	{
 	}
 
     private:
-	TestRtpReplicatorListener *listener;
+	TestRtpReplicatorListener *mListener;
 
 	void visitGeneral(const RtpGeneralStateItemPtr &item, const Ice::Current &)
 	{
-            listener->mGeneral = item;
+            mListener->mGeneral = item;
 			boost::mutex::scoped_lock lock(Testbed.mLock);
 			Testbed.mCondition.notify_one();
 	}
 
 	void visitSession(const RtpSessionStateItemPtr &item, const Ice::Current &)
 	{
-            listener->mSession = item;
+            mListener->mSession = item;
 			boost::mutex::scoped_lock lock(Testbed.mLock);
 			Testbed.mCondition.notify_one();
 	}
 
 	void visitStreamSink(const RtpStreamSinkStateItemPtr &item, const Ice::Current &)
 	{
-            listener->mSink = item;
+            mListener->mSink = item;
 			boost::mutex::scoped_lock lock(Testbed.mLock);
 			Testbed.mCondition.notify_one();
 	}
 
 	void visitStreamSource(const RtpStreamSourceStateItemPtr &item, const Ice::Current &)
 	{
-            listener->mSource = item;
+            mListener->mSource = item;
 			boost::mutex::scoped_lock lock(Testbed.mLock);
 			Testbed.mCondition.notify_one();
 	}

-----------------------------------------------------------------------


-- 
asterisk-scf/release/media_rtp_pjmedia.git