[asterisk-scf-commits] asterisk-scf/integration/sip.git branch "sip-configuration-refactor" updated.

[Commits to the Asterisk SCF project code repositories]

branch "sip-configuration-refactor" has been updated
       via  11629e962692477a673e861f3e5502eb6eca7ca0 (commit)
      from  10098f0a139e0b275530a4bdc20e91ecb744d6f7 (commit)

Summary of changes:
 src/SipConfiguration.cpp |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)


- Log -----------------------------------------------------------------
commit 11629e962692477a673e861f3e5502eb6eca7ca0
Author: Brent Eagles <beagles at digium.com>
Date:   Mon May 9 12:18:57 2011 -0230

    Fix some warnings and compilation errors found by gcc.

diff --git a/src/SipConfiguration.cpp b/src/SipConfiguration.cpp
index fcf6012..e60dc74 100644
--- a/src/SipConfiguration.cpp
+++ b/src/SipConfiguration.cpp
@@ -54,7 +54,7 @@ T createGroupTemplate(const T& group)
 }
 
 template<>
-SipGeneralGroupPtr createGroupTemplate(const SipGeneralGroupPtr& source)
+SipGeneralGroupPtr createGroupTemplate(const SipGeneralGroupPtr&)
 {
     return new SipGeneralGroup;
 }
@@ -336,14 +336,14 @@ private:
      * Configuration group itself.
      */
     mutable SipUDPTransportGroupPtr mGroup;
+
+    PJSipManager* mManager;
     
     /**
      * Transport within pjsip.
      */
     pjsip_transport *mTransport;
 
-    PJSipManager* mManager;
-
     bool mNeedsUpdating;
 };
 typedef boost::shared_ptr<UDPTransportConfig> UDPTransportConfigPtr;
@@ -524,7 +524,7 @@ public:
      * Constructor implementation for this
      */
     TLSTransportConfig(const SipTLSTransportGroupPtr& group, PJSipManager* manager) :
-        mGroup(new SipTLSTransportGroup),
+        mGroup(group),
         mManager(manager),
         mTransportFactory(0),
         mNeedsUpdating(false)
@@ -682,7 +682,8 @@ bool getItem(const C& collection, I& iter, const K& key)
 template <typename C, typename K>
 bool hasItem(const C& collection, const K& key)
 {
-    iter = collection.find(key);
+    typedef typename C::const_iterator Iter;
+    Iter iter = collection.find(key);
     return iter != collection.end();
 }
 

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


-- 
asterisk-scf/integration/sip.git