[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  860c8d2ca3fff73f2044dc742970bf5cd9c33d11 (commit)
      from  82f2598d09ccf1f05bb7ec3da66324694434bde0 (commit)

Summary of changes:
 src/BridgeReplicatorService.cpp        |    4 ++--
 src/BridgeReplicatorStateListenerI.cpp |    2 +-
 src/BridgeServiceConfig.h              |    4 ++--
 src/CMakeLists.txt                     |    2 +-
 test/CMakeLists.txt                    |    2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)


- Log -----------------------------------------------------------------
commit 860c8d2ca3fff73f2044dc742970bf5cd9c33d11
Author: Brent Eagles <beagles at digium.com>
Date:   Sun May 15 15:19:13 2011 -0230

    Apply changes for ice-util-cpp restructuring

diff --git a/src/BridgeReplicatorService.cpp b/src/BridgeReplicatorService.cpp
index eefdd13..6bda816 100644
--- a/src/BridgeReplicatorService.cpp
+++ b/src/BridgeReplicatorService.cpp
@@ -22,7 +22,7 @@
 #include <AsteriskSCF/Core/Discovery/ServiceLocatorIf.h>
 #include "ServiceUtil.h"
 #include "BridgeReplicatorIf.h"
-#include <AsteriskSCF/StateReplicator.h>
+#include <AsteriskSCF/Replication/StateReplicator.h>
 
 using namespace AsteriskSCF::System::Logging;
 using namespace AsteriskSCF::SessionCommunications::V1;
@@ -31,7 +31,7 @@ using namespace AsteriskSCF::Bridge::V1;
 using namespace AsteriskSCF;
 using namespace std;
 
-typedef AsteriskSCF::StateReplication::StateReplicator<
+typedef AsteriskSCF::Replication::StateReplicator<
     AsteriskSCF::Bridge::V1::Replicator,
     AsteriskSCF::Bridge::V1::ReplicatedStateItemPtr,
     string,
diff --git a/src/BridgeReplicatorStateListenerI.cpp b/src/BridgeReplicatorStateListenerI.cpp
index 5186463..9b82c50 100644
--- a/src/BridgeReplicatorStateListenerI.cpp
+++ b/src/BridgeReplicatorStateListenerI.cpp
@@ -16,7 +16,7 @@
 
 #include "BridgeReplicatorStateListenerI.h"
 #include "BridgeReplicatorIf.h"
-#include <AsteriskSCF/StateReplicator.h>
+#include <AsteriskSCF/Replication/StateReplicator.h>
 #include "BridgeServiceConfig.h"
 #include "DebugUtil.h"
 
diff --git a/src/BridgeServiceConfig.h b/src/BridgeServiceConfig.h
index 442e5f9..6f61e68 100644
--- a/src/BridgeServiceConfig.h
+++ b/src/BridgeServiceConfig.h
@@ -18,7 +18,7 @@
 #include <boost/current_function.hpp>
 #include <Ice/Ice.h>
 #include <string>
-#include <AsteriskSCF/SmartProxy.h>
+#include <AsteriskSCF/Discovery/SmartProxy.h>
 #include "BridgeReplicatorIf.h"
 
 //
@@ -67,7 +67,7 @@ inline std::string objectIdFromCurrent(const Ice::Current& current)
     return current.adapter->getCommunicator()->identityToString(current.id);
 }
 
-typedef AsteriskSCF::SmartProxy::SmartProxy<AsteriskSCF::Bridge::V1::ReplicatorPrx> ReplicatorSmartPrx;
+typedef AsteriskSCF::Discovery::SmartProxy<AsteriskSCF::Bridge::V1::ReplicatorPrx> ReplicatorSmartPrx;
 
 
 } // End of namespace BridgeService
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index edd252a..f12a0f0 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -3,7 +3,7 @@ if(NOT logger_dir)
 endif()
 include_directories(${logger_dir}/include)
 include_directories(${API_INCLUDE_DIR})
-include_directories(${utils_dir}/SmartProxy/include)
+include_directories(${utils_dir}/include)
 
 asterisk_scf_slice_include_directories(${API_SLICE_DIR})
 
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index ba3482d..b577e6e 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -3,7 +3,7 @@ if(NOT integrated_build STREQUAL "true")
   add_subdirectory(channel_driver/local_slice)
 endif()
 include_directories("../src")
-include_directories(${utils_dir}/SmartProxy/include)
+include_directories(${utils_dir}/include)
 if(NOT logger_dir)
   message(FATAL_ERROR "The logger directory could not be found ${logger_dir}")
 endif()

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


-- 
asterisk-scf/release/bridging.git