[asterisk-scf-commits] asterisk-scf/release/ice-util-cpp.git branch "master" updated.

[Commits to the Asterisk SCF project code repositories]

branch "master" has been updated
       via  cf2f9b9ada6a587a0cb2926c6c5d594eba26be76 (commit)
      from  853b36ba80ed5692b9f4b2acbfaa22f5f65cff2d (commit)

Summary of changes:
 AmiCollector/test/TestAmiCollector.h               |    4 ++--
 .../include/AsteriskSCF/StateReplicator.h          |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)


- Log -----------------------------------------------------------------
commit cf2f9b9ada6a587a0cb2926c6c5d594eba26be76
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/AmiCollector/test/TestAmiCollector.h b/AmiCollector/test/TestAmiCollector.h
index b714f13..41fae09 100644
--- a/AmiCollector/test/TestAmiCollector.h
+++ b/AmiCollector/test/TestAmiCollector.h
@@ -59,11 +59,11 @@ public:
 
 protected:
     ~TestAmiCollector() {}
-    void processResult(AsyncResultType result)
+    void processResult(AsyncResultType)
     {
         ++results;
     }
-    void processException(const Ice::Exception& e)
+    void processException(const Ice::Exception&)
     {
         ++exceptions;
     }
diff --git a/StateReplicator/include/AsteriskSCF/StateReplicator.h b/StateReplicator/include/AsteriskSCF/StateReplicator.h
index 425d2fb..6ecebce 100644
--- a/StateReplicator/include/AsteriskSCF/StateReplicator.h
+++ b/StateReplicator/include/AsteriskSCF/StateReplicator.h
@@ -291,7 +291,7 @@ public:
     /**
      * Returns the number of listeners currently registered with this replicator.
      */
-    int getListenerCount()
+    typename std::vector<L>::size_type getListenerCount()
     {
         boost::shared_lock<boost::shared_mutex> lock(mListenerLock);
         return mListeners.size();

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


-- 
asterisk-scf/release/ice-util-cpp.git