[asterisk-scf-commits] asterisk-scf/release/servicediscovery.git branch "master" updated.

Commits to the Asterisk SCF project code repositories asterisk-scf-commits at lists.digium.com
Mon Mar 14 06:16:58 CDT 2011


branch "master" has been updated
       via  d9ef2a8b4092b1258b81e8df01c1c052edb2517f (commit)
      from  b9e4e5d98418a006dd18cfe54935607a4a80a7a1 (commit)

Summary of changes:
 src/CollocatedIceStorm.cpp |    4 ++--
 src/CollocatedIceStorm.h   |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)


- Log -----------------------------------------------------------------
commit d9ef2a8b4092b1258b81e8df01c1c052edb2517f
Author: Kevin P. Fleming <kpfleming at digium.com>
Date:   Mon Mar 14 06:16:28 2011 -0500

    Update to accommodate DynamicLibrary moving to IceUtilInternal.

diff --git a/src/CollocatedIceStorm.cpp b/src/CollocatedIceStorm.cpp
index dbffcf3..54c05fc 100644
--- a/src/CollocatedIceStorm.cpp
+++ b/src/CollocatedIceStorm.cpp
@@ -40,8 +40,8 @@ CollocatedIceStorm::CollocatedIceStorm(const std::string& namePrefix, const Ice:
 
     std::string loadString = mCommunicator->getProperties()->getPropertyWithDefault("IceStorm.EntryPoint", "IceStormService:createIceStorm");
 
-    mLibrary = new IceInternal::DynamicLibrary;
-    IceInternal::DynamicLibrary::symbol_type entry = mLibrary->loadEntryPoint(loadString);
+    mLibrary = new IceUtilInternal::DynamicLibrary;
+    IceUtilInternal::DynamicLibrary::symbol_type entry = mLibrary->loadEntryPoint(loadString);
     if(entry == 0)
     {
         throw mLibrary->getErrorMessage();
diff --git a/src/CollocatedIceStorm.h b/src/CollocatedIceStorm.h
index e8b5da5..fb598ae 100644
--- a/src/CollocatedIceStorm.h
+++ b/src/CollocatedIceStorm.h
@@ -15,7 +15,7 @@
  */
 #pragma once
 
-#include <Ice/DynamicLibrary.h>
+#include <IceUtil/DynamicLibrary.h>
 #include <Ice/Service.h>
 #include <IceBox/IceBox.h>
 #include <Ice/Ice.h>
@@ -43,7 +43,7 @@ public:
     void stop();
 
 private:
-    IceInternal::DynamicLibraryPtr mLibrary;
+    IceUtilInternal::DynamicLibraryPtr mLibrary;
     IceBox::ServicePtr mService;
     Ice::CommunicatorPtr mCommunicator;
     bool mStopped;

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


-- 
asterisk-scf/release/servicediscovery.git



More information about the asterisk-scf-commits mailing list