[asterisk-scf-commits] asterisk-scf/integration/routing.git branch "retry_deux" updated.

[Commits to the Asterisk SCF project code repositories]

branch "retry_deux" has been updated
       via  43e480edb35d77ee53d0a0ee16ecd6df634d05b9 (commit)
      from  e5215d3ced9f44957497b74152c687c7c9e6cfdb (commit)

Summary of changes:
 test/RoutingEventsListener.cpp |   10 +++++-----
 test/TestRouting.cpp           |   19 ++++++++++++++-----
 2 files changed, 19 insertions(+), 10 deletions(-)


- Log -----------------------------------------------------------------
commit 43e480edb35d77ee53d0a0ee16ecd6df634d05b9
Author: Ken Hunt <ken.hunt at digium.com>
Date:   Mon Apr 16 13:19:44 2012 -0500

    Cleanup for gcc.

diff --git a/test/RoutingEventsListener.cpp b/test/RoutingEventsListener.cpp
index 19bb284..64f254e 100644
--- a/test/RoutingEventsListener.cpp
+++ b/test/RoutingEventsListener.cpp
@@ -33,8 +33,8 @@ RoutingEventsListener::RoutingEventsListener()
 }
 
 void RoutingEventsListener::lookupEvent(
-    const OperationContextPtr& operationContext, 
-    const string& destinationId, 
+    const OperationContextPtr&, 
+    const string&, 
     OperationResult result, 
     const Ice::Current&)
 {
@@ -45,9 +45,9 @@ void RoutingEventsListener::lookupEvent(
 }
 
 void RoutingEventsListener::addEndpointLocatorEvent(
-    const OperationContextPtr& operationContext, 
-    const string& id, const RegExSeq& destinationIdRangeList, 
-    const EndpointLocatorPrx& locator, 
+    const OperationContextPtr&, 
+    const string& , const RegExSeq& , 
+    const EndpointLocatorPrx& , 
     OperationResult result, 
     const Ice::Current&)
 {
diff --git a/test/TestRouting.cpp b/test/TestRouting.cpp
index 8b36be8..3e76fd3 100644
--- a/test/TestRouting.cpp
+++ b/test/TestRouting.cpp
@@ -178,13 +178,13 @@ struct GlobalIceFixture
 
             if(!topicManager)
             {
-                throw std::exception("Invalid proxy to IceStorm. Missing config for TopicManager.Proxy?");
+                throw std::runtime_error("Invalid proxy to IceStorm. Missing config for TopicManager.Proxy?");
             }
         }
         catch(const IceUtil::Exception&)
         {
 
-            throw std::exception("Can't get IceStorm TopicManager. Check config, and make sure IceStorm is running.");
+            throw std::runtime_error("Can't get IceStorm TopicManager. Check config, and make sure IceStorm is running.");
         }
 
         IceStorm::TopicPrx topic;
@@ -214,7 +214,7 @@ struct GlobalIceFixture
         }
         catch (const IceStorm::NoSuchTopic&) 
         {
-            throw std::exception("No such topic.");
+            throw std::runtime_error("No such topic.");
         }
 
     } // end Fixture() constructor
@@ -366,8 +366,17 @@ BOOST_AUTO_TEST_CASE(RetryAddEndpointLocator)
     try
     {
         OperationContextPtr retryContext = createContext();
-        SharedTestData::instance.locatorRegistry->addEndpointLocator(retryContext, "TestChannel", SharedTestData::instance.regExIds, SharedTestData::instance.endpointLocatorPrx);
-        SharedTestData::instance.locatorRegistry->addEndpointLocator(retryContext, "TestChannel", SharedTestData::instance.regExIds, SharedTestData::instance.endpointLocatorPrx);
+        SharedTestData::instance.locatorRegistry->addEndpointLocator(
+             retryContext, 
+             "TestChannel", 
+             SharedTestData::instance.regExIds, 
+             SharedTestData::instance.endpointLocatorPrx);
+
+        SharedTestData::instance.locatorRegistry->addEndpointLocator(
+            retryContext, 
+            "TestChannel", 
+            SharedTestData::instance.regExIds, 
+            SharedTestData::instance.endpointLocatorPrx);
     }
     catch (...)
     {

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


-- 
asterisk-scf/integration/routing.git