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

[Commits to the Asterisk SCF project code repositories]

branch "master" has been updated
       via  d7b3a654e94a293f98b3188584aa12ff63883549 (commit)
       via  f34fa4b630aa2934fea6ec0237dab5202cd390d1 (commit)
       via  a775bb97f1292411a64f6f39ef99396b7d9c20cb (commit)
       via  96dd2d8c9c0d398dac5185913bb4237e9b41d76a (commit)
      from  8e9b2827ffe23f38b479a044571477d085beb6ad (commit)

Summary of changes:
 src/CMakeLists.txt     |    4 +---
 src/EndpointRegistry.h |    4 ++--
 test/TestRouting.cpp   |    5 +++--
 3 files changed, 6 insertions(+), 7 deletions(-)


- Log -----------------------------------------------------------------
commit d7b3a654e94a293f98b3188584aa12ff63883549
Author: Joshua Colp <jcolp at digium.com>
Date:   Mon Aug 23 21:22:29 2010 -0300

    Fix a build issue by commenting out an unused variable and leaving a note for Ken.

diff --git a/test/TestRouting.cpp b/test/TestRouting.cpp
index 4017abe..60ea0c3 100644
--- a/test/TestRouting.cpp
+++ b/test/TestRouting.cpp
@@ -274,7 +274,8 @@ BOOST_AUTO_TEST_CASE(AddAndRemoveEndpointLocator)
 
 BOOST_FIXTURE_TEST_CASE(LookupOwnEndpoint, PerTestFixture)
 {
-   bool lookupSucceeded(true);
+	// KEN: This isn't actually used, should it be? */
+//   bool lookupSucceeded(true);
 	try
    {
       string lookupVal = "102";
@@ -298,4 +299,4 @@ BOOST_FIXTURE_TEST_CASE(LookupOwnEndpoint, PerTestFixture)
       BOOST_CHECK(unknownException);
  }
 	
-}
\ No newline at end of file
+}

commit f34fa4b630aa2934fea6ec0237dab5202cd390d1
Merge: a775bb9 8e9b282
Author: Joshua Colp <jcolp at digium.com>
Date:   Mon Aug 23 21:20:51 2010 -0300

    Merge branch 'master' of git.asterisk.org:asterisk-scf/integration/routing


commit a775bb97f1292411a64f6f39ef99396b7d9c20cb
Author: Joshua Colp <jcolp at digium.com>
Date:   Mon Aug 23 21:20:28 2010 -0300

    Make GCC happy by removing an EndpointRegistry:: from somewhere it should not be.

diff --git a/src/EndpointRegistry.h b/src/EndpointRegistry.h
index 4f66dc2..0fa6f13 100644
--- a/src/EndpointRegistry.h
+++ b/src/EndpointRegistry.h
@@ -17,7 +17,7 @@ class EndpointRegistry : public Hydra::Core::Routing::V1::LocatorRegistry
 public:
    EndpointRegistry();
 
-   void EndpointRegistry::setScriptProcessor(boost::shared_ptr<ScriptProcessor> scriptProcessor);
+   void setScriptProcessor(boost::shared_ptr<ScriptProcessor> scriptProcessor);
 
 public: 
     // LocatorRegistry overrides
@@ -79,4 +79,4 @@ private:
 };
 
 }; // end BasicRoutingService
-}; // end Hydra
\ No newline at end of file
+}; // end Hydra

commit 96dd2d8c9c0d398dac5185913bb4237e9b41d76a
Author: Joshua Colp <jcolp at digium.com>
Date:   Mon Aug 23 21:20:04 2010 -0300

    Use the proper mechanism for finding and using Lua.

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index a0e46fc..0204a70 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,8 +1,6 @@
 # Create the actual standalone basic routing component
 hydra_component_init(BasicRoutingService CXX)
-INCLUDE(FindLua51)
-get_filename_component(LUA_LOC ${LUA_LIBRARIES} PATH)
-LINK_DIRECTORIES(${LUA_LOC})
+find_package(Lua51 REQUIRED)
 include_directories(${LUA_INCLUDE_DIR})
 hydra_component_add_slice(BasicRoutingService RoutingIf)
 hydra_component_add_slice(BasicRoutingService ServiceLocatorIf)

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


-- 
asterisk-scf/integration/routing.git