[asterisk-scf-commits] asterisk-scf/integration/bridging.git branch "single-build-dir" updated.
Commits to the Asterisk SCF project code repositories
asterisk-scf-commits at lists.digium.com
Tue Apr 26 11:50:14 CDT 2011
branch "single-build-dir" has been updated
discards 4faed0d03381761958a5c438263ad4f652b6eb61 (commit)
discards 0e9861b8e549c4a846f6e3d3867a9ad5d11a9f03 (commit)
discards ba42f30351e094f5fe76b24a496d7e1baa3a11a6 (commit)
via 247d3585bd13d852d02c8699df353d6f0ec92fda (commit)
via 858c1b9af86d3e4be1848bb30a7dd84580a7c12f (commit)
via 4de045a1b56c078a7fb73cf95f6a38370ee531d4 (commit)
via d904018732faf4dc3c2fbef6784fb70d6f72a9f6 (commit)
This update added new revisions after undoing existing revisions. That is
to say, the old revision is not a strict subset of the new revision. This
situation occurs when you --force push a change and generate a repository
containing something like this:
* -- * -- B -- O -- O -- O (4faed0d03381761958a5c438263ad4f652b6eb61)
\
N -- N -- N (247d3585bd13d852d02c8699df353d6f0ec92fda)
When this happens we assume that you've already had alert emails for all
of the O revisions, and so we here report only the revisions in the N
branch from the common base, B.
Summary of changes:
src/BridgeImpl.cpp | 2 +-
src/BridgeReplicatorService.cpp | 4 ++--
src/DebugUtil.h | 2 +-
src/MediaSplicer.cpp | 4 ++--
src/SessionWrapper.cpp | 2 +-
5 files changed, 7 insertions(+), 7 deletions(-)
- Log -----------------------------------------------------------------
commit 247d3585bd13d852d02c8699df353d6f0ec92fda
Author: Kevin P. Fleming <kpfleming at digium.com>
Date: Tue Apr 26 11:42:58 2011 -0500
Remove configuration of file that does not need it now.
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e8432c0..5483175 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -27,5 +27,4 @@ endif()
asterisk_scf_project(BridgingService 3.4)
add_subdirectory(src)
-add_subdirectory(config)
add_subdirectory(test)
diff --git a/config/CMakeLists.txt b/config/CMakeLists.txt
deleted file mode 100644
index df5843f..0000000
--- a/config/CMakeLists.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-# Asterisk Scalable Communications Framework
-#
-# Copyright (C) 2010 -- Digium, Inc.
-#
-# All rights reserved.
-#
-
-configure_file(test_bridging.conf.in test_bridging.conf)
commit 858c1b9af86d3e4be1848bb30a7dd84580a7c12f
Author: Kevin P. Fleming <kpfleming at digium.com>
Date: Tue Apr 26 11:36:42 2011 -0500
Rename a config file that was missed in the previous round of changes.
diff --git a/config/test_bridging.conf.in b/config/test_bridging.conf
similarity index 100%
rename from config/test_bridging.conf.in
rename to config/test_bridging.conf
commit 4de045a1b56c078a7fb73cf95f6a38370ee531d4
Author: Kevin P. Fleming <kpfleming at digium.com>
Date: Mon Apr 25 17:49:26 2011 -0500
Changes to work with new single-build-directory CMake script.
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9979a32..e8432c0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -16,9 +16,6 @@ if(NOT integrated_build STREQUAL "true")
# Include common AsteriskSCF build infrastructure
include(cmake/AsteriskSCF.cmake)
- # This project is C++ based and requires a minimum of 3.4
- asterisk_scf_project(BridgingService 3.4 CXX)
-
# Take care of slice definitions
add_subdirectory(slice)
@@ -27,6 +24,8 @@ if(NOT integrated_build STREQUAL "true")
add_subdirectory(logger)
endif()
+asterisk_scf_project(BridgingService 3.4)
+
add_subdirectory(src)
add_subdirectory(config)
add_subdirectory(test)
diff --git a/config/test_bridging.conf.in b/config/test_bridging.conf.in
index 37d7b8c..8aa0cf7 100644
--- a/config/test_bridging.conf.in
+++ b/config/test_bridging.conf.in
@@ -108,13 +108,13 @@ ServiceLocatorManagementProxy=LocatorServiceManagement:tcp -p 4422
#
# The IceBox entries for loading the services.
#
-IceBox.Service.Logger=${logger_bindir}/server/src at logging-service:createLoggingService
-IceBox.Service.Replicator=../src at BridgeReplicator:create
-IceBox.Service.TestBridge=../src at bridgeservice:create
-IceBox.Service.TestBridge2=../src/@bridgeservice:create
-IceBox.Service.TestServiceLocator=${service_locator_bindir}/src at service_locator:create
-IceBox.Service.TestChannel=${test_channel_bindir}/src at test_channel:create
-IceBox.Service.TestDriver=../test at bridge_component_test:create
+IceBox.Service.Logger=logging-service:createLoggingService
+IceBox.Service.Replicator=BridgeReplicator:create
+IceBox.Service.TestBridge=bridgeservice:create
+IceBox.Service.TestBridge2=bridgeservice:create
+IceBox.Service.TestServiceLocator=service_locator:create
+IceBox.Service.TestChannel=test_channel:create
+IceBox.Service.TestDriver=bridge_component_test:create
#
# The bridging service uses the test channel`s Endpoint
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 2dfcc0e..b74c1e9 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -34,7 +34,7 @@ target_link_libraries(bridge_component_test test-channel-api)
# component tests only work for integrated builds
if(integrated_build STREQUAL "true")
- icebox_add_test(bridge_component_test ../config/test_bridging.conf)
+ asterisk_scf_test_icebox(bridge_component_test config/test_bridging.conf)
endif()
asterisk_scf_component_init(bridge_unit_tests CXX)
commit d904018732faf4dc3c2fbef6784fb70d6f72a9f6
Author: Fred Anderson <fanderson at digium.com>
Date: Tue Apr 26 11:18:49 2011 -0500
Fixed warning messages
diff --git a/src/BridgeImpl.cpp b/src/BridgeImpl.cpp
index 986aa73..0ce1947 100755
--- a/src/BridgeImpl.cpp
+++ b/src/BridgeImpl.cpp
@@ -523,7 +523,7 @@ BridgeImpl::~BridgeImpl()
}
void BridgeImpl::addSessions_async(const AMD_Bridge_addSessionsPtr& callback, const SessionSeq& sessions,
- const Ice::Current& current)
+ const Ice::Current&)
{
try
{
diff --git a/src/BridgeReplicatorService.cpp b/src/BridgeReplicatorService.cpp
index 06a5394..eefdd13 100644
--- a/src/BridgeReplicatorService.cpp
+++ b/src/BridgeReplicatorService.cpp
@@ -65,7 +65,7 @@ BridgeReplicatorApp::BridgeReplicatorApp()
{
}
-void BridgeReplicatorApp::start(const string& name, const Ice::CommunicatorPtr& communicator, const Ice::StringSeq& args)
+void BridgeReplicatorApp::start(const string& name, const Ice::CommunicatorPtr& communicator, const Ice::StringSeq&)
{
Logger logger = getLoggerFactory().getLogger("AsteriskSCF.BridgeReplicator");
logger(Debug) << "Launching AsteriskSCF Bridge Replicator Service." ;
@@ -190,7 +190,7 @@ void BridgeReplicatorApp::stop()
}
extern "C" {
-ASTERISK_SCF_ICEBOX_EXPORT ::IceBox::Service* create(Ice::CommunicatorPtr communicator)
+ASTERISK_SCF_ICEBOX_EXPORT ::IceBox::Service* create(Ice::CommunicatorPtr)
{
return new BridgeReplicatorApp;
}
diff --git a/src/DebugUtil.h b/src/DebugUtil.h
index 102ec5d..b8e6e41 100644
--- a/src/DebugUtil.h
+++ b/src/DebugUtil.h
@@ -63,7 +63,7 @@ std::ostream& dumpState(std::ostream& os, const std::string& prefix,
inline
std::ostream& dumpState(std::ostream& os, const AsteriskSCF::Bridge::V1::BridgeStateItemPtr& state,
- const Ice::CommunicatorPtr& comm)
+ const Ice::CommunicatorPtr&)
{
#ifndef _NDEBUG
if (!state)
diff --git a/src/MediaSplicer.cpp b/src/MediaSplicer.cpp
index 233df9e..154027e 100755
--- a/src/MediaSplicer.cpp
+++ b/src/MediaSplicer.cpp
@@ -696,7 +696,7 @@ protected:
mListener->succeeded();
}
- void failed(const Ice::Exception& ex)
+ void failed(const Ice::Exception&)
{
mListener->failed();
}
@@ -937,7 +937,7 @@ protected:
}
}
- void failed(const Ice::Exception& ex, size_t position)
+ void failed(const Ice::Exception&, size_t)
{
//
// TODO: Do something special here probably. Its not clear that the whole operation should failed if a single
diff --git a/src/SessionWrapper.cpp b/src/SessionWrapper.cpp
index a4da471..4693d61 100644
--- a/src/SessionWrapper.cpp
+++ b/src/SessionWrapper.cpp
@@ -122,7 +122,7 @@ protected:
mListener->succeeded();
}
- void failed(const Ice::Exception& ex)
+ void failed(const Ice::Exception&)
{
//
// TODO: Log exception.
-----------------------------------------------------------------------
--
asterisk-scf/integration/bridging.git
More information about the asterisk-scf-commits
mailing list