[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
Tue Jul 19 13:33:57 CDT 2011


branch "master" has been updated
       via  ce9188327600549052e8a0b7e8355f3edce381de (commit)
       via  047ee561b2c0b574bd8bd20c19b84256289481f5 (commit)
      from  b0ed098755f70b5ccd942d79547edf1d926bf78a (commit)

Summary of changes:
 test/BridgeListenerI.cpp |    5 ++---
 test/TestBridging.cpp    |    2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)


- Log -----------------------------------------------------------------
commit ce9188327600549052e8a0b7e8355f3edce381de
Author: Kevin P. Fleming <kpfleming at digium.com>
Date:   Tue Jul 19 13:33:52 2011 -0500

    Resolve compiler warning about size_t/int comparison.

diff --git a/test/TestBridging.cpp b/test/TestBridging.cpp
index 38ecc55..a8052ac 100644
--- a/test/TestBridging.cpp
+++ b/test/TestBridging.cpp
@@ -82,7 +82,7 @@ BridgeCookies bakeTestCookies()
 
 void tasteCookies(const BridgeCookies& cookies, bool a, bool b, bool c, bool d)
 {
-    int count = 0;
+    size_t count = 0;
     if (a)
     {
         ++count;

commit 047ee561b2c0b574bd8bd20c19b84256289481f5
Author: Kevin P. Fleming <kpfleming at digium.com>
Date:   Tue Jul 19 13:33:30 2011 -0500

    Resolve compiler warnings about unused variables.

diff --git a/test/BridgeListenerI.cpp b/test/BridgeListenerI.cpp
index 222995f..8a95767 100644
--- a/test/BridgeListenerI.cpp
+++ b/test/BridgeListenerI.cpp
@@ -81,7 +81,7 @@ bool BridgeListenerI::resetStopped()
 bool BridgeListenerI::waitForAdded(unsigned long milliseconds, AsteriskSCF::SessionCommunications::V1::SessionSeq& added)
 {
     IceUtil::Monitor<IceUtil::Mutex>::Lock lock(mAddMonitor);
-    bool waitResult = mAddMonitor.timedWait(IceUtil::Time::milliSeconds(milliseconds));
+    mAddMonitor.timedWait(IceUtil::Time::milliSeconds(milliseconds));
     added = mAdded;
     mAdded.clear();
     return !added.empty();
@@ -90,11 +90,10 @@ bool BridgeListenerI::waitForAdded(unsigned long milliseconds, AsteriskSCF::Sess
 bool BridgeListenerI::waitForRemoved(unsigned long milliseconds, AsteriskSCF::SessionCommunications::V1::SessionSeq& removed)
 {
     IceUtil::Monitor<IceUtil::Mutex>::Lock lock(mRemoveMonitor);
-    bool waitResult = mRemoveMonitor.timedWait(IceUtil::Time::milliSeconds(milliseconds));
+    mRemoveMonitor.timedWait(IceUtil::Time::milliSeconds(milliseconds));
     removed = mRemoved;
     mRemoved.clear();
     return !removed.empty();
-
 }
 
 bool BridgeListenerI::waitForStopped(unsigned long milliseconds)

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


-- 
asterisk-scf/release/bridging.git



More information about the asterisk-scf-commits mailing list