[asterisk-scf-commits] asterisk-scf/release/bridging.git branch "master" updated.
Commits to the Asterisk SCF project code repositories
asterisk-scf-commits at lists.digium.com
Fri Jan 7 21:02:47 UTC 2011
branch "master" has been updated
via d1f56f5716ef3a5ab6efc8947e17660058b23465 (commit)
from 6f03b48a979daa54af637d238cb93679fc5b8936 (commit)
Summary of changes:
src/BridgeImpl.cpp | 6 +++---
src/BridgeImpl.h | 2 +-
src/BridgeListenerMgr.h | 2 +-
src/BridgeManagerImpl.cpp | 2 +-
src/BridgeManagerImpl.h | 2 +-
src/BridgeManagerListenerMgr.h | 2 +-
src/CMakeLists.txt | 3 +--
src/MediaSplicer.cpp | 2 +-
src/MediaSplicer.h | 2 +-
src/Service.cpp | 6 +++---
test/BridgeListenerI.h | 2 +-
test/BridgeManagerListenerI.h | 2 +-
test/CMakeLists.txt | 3 +--
test/SessionListenerI.h | 2 +-
test/TestBridging.cpp | 4 ++--
15 files changed, 20 insertions(+), 22 deletions(-)
- Log -----------------------------------------------------------------
commit d1f56f5716ef3a5ab6efc8947e17660058b23465
Author: Ken Hunt <ken.hunt at digium.com>
Date: Fri Jan 7 14:47:21 2011 -0600
Adjust #includes to use <> and prefix paths with AsteriskSCF.
diff --git a/src/BridgeImpl.cpp b/src/BridgeImpl.cpp
index efb0221..68e6ed0 100755
--- a/src/BridgeImpl.cpp
+++ b/src/BridgeImpl.cpp
@@ -14,9 +14,9 @@
* at the top of the source tree.
*/
#include "BridgeImpl.h"
-#include "logger.h"
-#include <System/Component/ComponentServiceIf.h>
-#include <SessionCommunications/SessionCommunicationsIf.h>
+#include <AsteriskSCF/logger.h>
+#include <AsteriskSCF/System/Component/ComponentServiceIf.h>
+#include <AsteriskSCF/SessionCommunications/SessionCommunicationsIf.h>
#include <Ice/Ice.h>
#include <memory>
#include <algorithm>
diff --git a/src/BridgeImpl.h b/src/BridgeImpl.h
index 8044d24..dffb7c4 100644
--- a/src/BridgeImpl.h
+++ b/src/BridgeImpl.h
@@ -15,7 +15,7 @@
*/
#pragma once
-#include <SessionCommunications/SessionCommunicationsIf.h>
+#include <AsteriskSCF/SessionCommunications/SessionCommunicationsIf.h>
#include <boost/thread/shared_mutex.hpp>
#include <vector>
#include "MediaSplicer.h"
diff --git a/src/BridgeListenerMgr.h b/src/BridgeListenerMgr.h
index 041fd0d..ba4db4a 100644
--- a/src/BridgeListenerMgr.h
+++ b/src/BridgeListenerMgr.h
@@ -18,7 +18,7 @@
#include <string>
#include <Ice/Ice.h>
#include "ListenerManager.h"
-#include <SessionCommunications/SessionCommunicationsIf.h>
+#include <AsteriskSCF/SessionCommunications/SessionCommunicationsIf.h>
namespace AsteriskSCF
{
diff --git a/src/BridgeManagerImpl.cpp b/src/BridgeManagerImpl.cpp
index dd5c293..c820cc2 100644
--- a/src/BridgeManagerImpl.cpp
+++ b/src/BridgeManagerImpl.cpp
@@ -19,7 +19,7 @@
#include <boost/thread/locks.hpp>
#include "BridgeListenerMgr.h"
#include "BridgeManagerListenerMgr.h"
-#include "logger.h"
+#include <AsteriskSCF/logger.h>
using namespace AsteriskSCF::System::Logging;
diff --git a/src/BridgeManagerImpl.h b/src/BridgeManagerImpl.h
index c2a18a5..014106c 100644
--- a/src/BridgeManagerImpl.h
+++ b/src/BridgeManagerImpl.h
@@ -15,7 +15,7 @@
*/
#pragma once
-#include <SessionCommunications/SessionCommunicationsIf.h>
+#include <AsteriskSCF/SessionCommunications/SessionCommunicationsIf.h>
#include <boost/thread/shared_mutex.hpp>
#include <vector>
diff --git a/src/BridgeManagerListenerMgr.h b/src/BridgeManagerListenerMgr.h
index 1579772..b2758ab 100644
--- a/src/BridgeManagerListenerMgr.h
+++ b/src/BridgeManagerListenerMgr.h
@@ -18,7 +18,7 @@
#include <string>
#include <Ice/Ice.h>
#include "ListenerManager.h"
-#include <SessionCommunications/SessionCommunicationsIf.h>
+#include <AsteriskSCF/SessionCommunications/SessionCommunicationsIf.h>
namespace AsteriskSCF
{
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 8cf2694..2e42923 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -21,8 +21,7 @@ asterisk_scf_component_add_boost_libraries(bridgeservice thread date_time)
if(NOT logger_dir)
message(FATAL_ERROR "The logger directory could not be found ${logger_dir}")
endif()
-include_directories(${logger_dir}/common)
-include_directories(${logger_dir}/client/src)
+include_directories(${logger_dir}/include)
asterisk_scf_component_build_icebox(bridgeservice)
target_link_libraries(bridgeservice logging-client)
diff --git a/src/MediaSplicer.cpp b/src/MediaSplicer.cpp
index 3f87f23..8c5d10a 100755
--- a/src/MediaSplicer.cpp
+++ b/src/MediaSplicer.cpp
@@ -16,7 +16,7 @@
#include "MediaSplicer.h"
#include <IceUtil/Shared.h>
#include <IceUtil/Handle.h>
-#include "logger.h"
+#include <AsteriskSCF/logger.h>
using namespace AsteriskSCF::System::Logging;
namespace
diff --git a/src/MediaSplicer.h b/src/MediaSplicer.h
index 466bb1d..a8154db 100644
--- a/src/MediaSplicer.h
+++ b/src/MediaSplicer.h
@@ -17,7 +17,7 @@
#include <IceUtil/Shared.h>
#include <Media/MediaIf.h>
-#include <SessionCommunications/SessionCommunicationsIf.h>
+#include <AsteriskSCF/SessionCommunications/SessionCommunicationsIf.h>
#include <memory>
namespace AsteriskSCF
diff --git a/src/Service.cpp b/src/Service.cpp
index 406760d..99820e9 100644
--- a/src/Service.cpp
+++ b/src/Service.cpp
@@ -19,9 +19,9 @@
#include <IceBox/IceBox.h>
#include <IceStorm/IceStorm.h>
-#include "Core/Discovery/ServiceLocatorIf.h"
-#include "IceLogger.h"
-#include "logger.h"
+#include <AsteriskSCF/Logger/IceLogger.h>
+#include <AsteriskSCF/logger.h>
+#include <AsteriskSCF/Core/Discovery/ServiceLocatorIf.h>
using namespace AsteriskSCF::System::Logging;
diff --git a/test/BridgeListenerI.h b/test/BridgeListenerI.h
index 7f56615..8e0e255 100644
--- a/test/BridgeListenerI.h
+++ b/test/BridgeListenerI.h
@@ -15,7 +15,7 @@
*/
#pragma once
-#include <SessionCommunications/SessionCommunicationsIf.h>
+#include <AsteriskSCF/SessionCommunications/SessionCommunicationsIf.h>
namespace AsteriskSCF
{
diff --git a/test/BridgeManagerListenerI.h b/test/BridgeManagerListenerI.h
index 206e5c1..fbf4854 100644
--- a/test/BridgeManagerListenerI.h
+++ b/test/BridgeManagerListenerI.h
@@ -15,7 +15,7 @@
*/
#pragma once
-#include <SessionCommunications/SessionCommunicationsIf.h>
+#include <AsteriskSCF/SessionCommunications/SessionCommunicationsIf.h>
namespace AsteriskSCF
{
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 8f01913..22bba34 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -23,8 +23,7 @@ asterisk_scf_component_add_boost_libraries(bridging_unit_test unit_test_framewor
if(NOT logger_dir)
message(FATAL_ERROR "The logger directory could not be found ${logger_dir}")
endif()
-include_directories(${logger_dir}/common)
-include_directories(${logger_dir}/client/src)
+include_directories(${logger_dir}/include)
asterisk_scf_component_build_icebox(bridging_unit_test)
target_link_libraries(bridging_unit_test logging-client)
diff --git a/test/SessionListenerI.h b/test/SessionListenerI.h
index f33091e..19152fd 100644
--- a/test/SessionListenerI.h
+++ b/test/SessionListenerI.h
@@ -16,7 +16,7 @@
#pragma once
#include <Ice/Ice.h>
-#include <SessionCommunications/SessionCommunicationsIf.h>
+#include <AsteriskSCF/SessionCommunications/SessionCommunicationsIf.h>
namespace AsteriskSCF
{
diff --git a/test/TestBridging.cpp b/test/TestBridging.cpp
index 3c03bac..b6762c9 100644
--- a/test/TestBridging.cpp
+++ b/test/TestBridging.cpp
@@ -19,8 +19,8 @@
#include <boost/bind.hpp>
#include <boost/test/unit_test.hpp>
#include <boost/test/debug.hpp>
-#include <SessionCommunications/SessionCommunicationsIf.h>
-#include <Media/MediaIf.h>
+#include <AsteriskSCF/SessionCommunications/SessionCommunicationsIf.h>
+#include <AsteriskSCF/Media/MediaIf.h>
#include "BridgeManagerListenerI.h"
#include "BridgeListenerI.h"
-----------------------------------------------------------------------
--
asterisk-scf/release/bridging.git
More information about the asterisk-scf-commits
mailing list