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

[Commits to the Asterisk SCF project code repositories]

branch "master" has been updated
       via  252f5aae48c75f150ddc3935a9b9a44ba74cde76 (commit)
      from  37173c75613532b910e8512238bfb18ed081f291 (commit)

Summary of changes:
 src/BridgeImpl.h         |    4 ++--
 src/InternalExceptions.h |   10 +++++-----
 test/TestBridging.cpp    |    8 ++++----
 3 files changed, 11 insertions(+), 11 deletions(-)


- Log -----------------------------------------------------------------
commit 252f5aae48c75f150ddc3935a9b9a44ba74cde76
Author: Kevin P. Fleming <kpfleming at digium.com>
Date:   Tue Apr 12 16:36:24 2011 -0500

    Resolve some variable shadowing warnings.

diff --git a/src/BridgeImpl.h b/src/BridgeImpl.h
index 8b1ee88..992a1e2 100644
--- a/src/BridgeImpl.h
+++ b/src/BridgeImpl.h
@@ -35,10 +35,10 @@ public:
     {
     public:
 
-        BridgeSession(const SessionCommunications::V1::SessionPrx& s, const MediaConnectorPtr& con, bool isConnected) :
+        BridgeSession(const SessionCommunications::V1::SessionPrx& s, const MediaConnectorPtr& con, bool connected) :
             mSession(s),
             mConnector(con),
-            mConnected(isConnected)
+            mConnected(connected)
         {
         }
 
diff --git a/src/InternalExceptions.h b/src/InternalExceptions.h
index 17d189e..0b80c17 100644
--- a/src/InternalExceptions.h
+++ b/src/InternalExceptions.h
@@ -23,17 +23,17 @@ public:
 
     ConfigException(const std::string& propertyName, const std::string& message)
     {
-        std::stringstream what;
-        what << propertyName << " configuration error: ";
+        std::stringstream whatstr;
+        whatstr << propertyName << " configuration error: ";
         if(message.size() != 0)
         {
-            what << message;
+            whatstr << message;
         }
         else
         {
-            what << "(no message)";
+            whatstr << "(no message)";
         }
-        mWhat = what.str();
+        mWhat = whatstr.str();
     }
 
     ~ConfigException() throw()
diff --git a/test/TestBridging.cpp b/test/TestBridging.cpp
index 6ece8b7..c55d9d4 100644
--- a/test/TestBridging.cpp
+++ b/test/TestBridging.cpp
@@ -43,8 +43,8 @@ namespace
 class TestEnvironment : public IceUtil::Shared
 {
 public:
-    TestEnvironment(const Ice::CommunicatorPtr& communicator, const Ice::StringSeq& args) :
-        mCommunicator(communicator),
+    TestEnvironment(const Ice::CommunicatorPtr& comm, const Ice::StringSeq& args) :
+        mCommunicator(comm),
         mArgs(args),
         mArgv(0)
     {
@@ -220,8 +220,8 @@ void addServant(T& proxy, const Ice::ObjectAdapterPtr& adapter, const Ice::Objec
 class BridgeTester
 {
 public:
-    BridgeTester(const TestEnvironmentPtr& env) :
-        mTestEnvironment(env)
+    BridgeTester(const TestEnvironmentPtr& e) :
+        mTestEnvironment(e)
     {
     }
 

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


-- 
asterisk-scf/release/bridging.git