[asterisk-scf-commits] asterisk-scf/integration/statereplicator.git branch "master" updated.

[Commits to the Asterisk SCF project code repositories]

branch "master" has been updated
       via  0725be8f7b208fb427c81014e5ca4bd737900794 (commit)
      from  3f9ec8408a5fbff32828a61a96b0a72f0d586815 (commit)

Summary of changes:
 src/CMakeLists.txt    |    2 +-
 src/StateReplicator.h |   20 ++++++++++----------
 2 files changed, 11 insertions(+), 11 deletions(-)


- Log -----------------------------------------------------------------
commit 0725be8f7b208fb427c81014e5ca4bd737900794
Author: Ken Hunt <ken.hunt at digium.com>
Date:   Thu Sep 23 15:59:18 2010 -0500

    Made the code Linux-happy with spaces around nested template args and typename for ::iterator references.

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 670ed86..ff78841 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -7,5 +7,5 @@ hydra_component_add_file(StateReplicator StateReplicator.cpp)
 
 hydra_component_build_library(StateReplicator)
 
-hydra_component_install(StateReplicator RUNTIME lib "State Replicator" StateReplicator)
+hydra_component_install(StateReplicator LIBRARY lib "State Replicator" statereplicator)
 
diff --git a/src/StateReplicator.h b/src/StateReplicator.h
index 5a4fb81..faea044 100644
--- a/src/StateReplicator.h
+++ b/src/StateReplicator.h
@@ -100,7 +100,7 @@ public:
     */
    void removeListener(const L& listener, const Ice::Current& = ::Ice::Current())
    {
-      std::vector<L>::iterator it = std::find_if(mListeners.begin(), mListeners.end(), IdentifyListener<L>(listener));
+      typename std::vector<L>::iterator it = std::find_if(mListeners.begin(), mListeners.end(), IdentifyListener<L>(listener));
 
       if (it != mListeners.end())
       {
@@ -123,12 +123,12 @@ public:
    {
       std::vector<K> allIds;
 
-      for(std::map<K, S>::const_iterator it = mStateItemMap.begin(); it != mStateItemMap.end(); ++it)
+      for(typename std::map<K, S>::const_iterator it = mStateItemMap.begin(); it != mStateItemMap.end(); ++it)
       {
          allIds.push_back(it->first);
       }
 
-      for_each(mListeners.begin(), mListeners.end(), RemoveStateNotice<L,std::vector<K>>(allIds));
+      for_each(mListeners.begin(), mListeners.end(), RemoveStateNotice<L,std::vector<K> >(allIds));
 
       mStateItemMap.clear();
    }
@@ -139,10 +139,10 @@ public:
     */
    void setState(const std::vector<S>& items, const Ice::Current& = ::Ice::Current())
    {
-      for (std::vector<S>::const_iterator iter = items.begin();
+      for (typename std::vector<S>::const_iterator iter = items.begin();
             iter != items.end(); ++iter)
       {
-         std::map<K, S>::iterator mapItem = mStateItemMap.find((*iter)->key);
+         typename std::map<K, S>::iterator mapItem = mStateItemMap.find((*iter)->key);
 
          if (mapItem != mStateItemMap.end())
          {
@@ -154,7 +154,7 @@ public:
          }
       }
 
-      for_each( mListeners.begin(), mListeners.end(), SetStateNotice<L,std::vector<S>>(items) );
+      for_each( mListeners.begin(), mListeners.end(), SetStateNotice<L,std::vector<S> >(items) );
    }
 
    /**
@@ -163,12 +163,12 @@ public:
     */
    void removeState(const std::vector<K>& ids, const Ice::Current& = ::Ice::Current())
    {
-      for (std::vector<K>::const_iterator iter = ids.begin(); iter != ids.end(); ++iter)
+      for (typename std::vector<K>::const_iterator iter = ids.begin(); iter != ids.end(); ++iter)
       {
          mStateItemMap.erase(*iter);
       }
 
-      for_each(mListeners.begin(), mListeners.end(), RemoveStateNotice<L,std::vector<K>>(ids));
+      for_each(mListeners.begin(), mListeners.end(), RemoveStateNotice<L,std::vector<K> >(ids));
    }
 
    /**
@@ -179,7 +179,7 @@ public:
    { 
       std::vector<S> results;
 
-      for(std::vector<K>::const_iterator it = itemKeys.begin(); it != itemKeys.end(); ++it)
+      for(typename std::vector<K>::const_iterator it = itemKeys.begin(); it != itemKeys.end(); ++it)
       {
          results.push_back(mStateItemMap[(*it)]);
       }
@@ -194,7 +194,7 @@ public:
    {
       std::vector<S> results;
 
-      for(std::map<K, S>::const_iterator it = mStateItemMap.begin(); it != mStateItemMap.end(); ++it)
+      for(typename std::map<K, S>::const_iterator it = mStateItemMap.begin(); it != mStateItemMap.end(); ++it)
       {
          results.push_back(it->second);
       }

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


-- 
asterisk-scf/integration/statereplicator.git