[asterisk-scf-commits] asterisk-scf/integration/ice.git branch "move-dynamiclibrary-to-iceutil" updated.
Commits to the Asterisk SCF project code repositories
asterisk-scf-commits at lists.digium.com
Sat Mar 12 16:59:15 CST 2011
branch "move-dynamiclibrary-to-iceutil" has been updated
via f376ea3d1d8d1805b0297c0d8146c4888c12386b (commit)
from 900a64ecee89c2c7bb90867ff82eeedfb176f390 (commit)
Summary of changes:
cpp/include/IceUtil/DynamicLibrary.h | 2 +-
cpp/include/IceUtil/DynamicLibraryF.h | 6 +++---
cpp/src/Ice/CommunicatorI.cpp | 2 +-
cpp/src/Ice/CommunicatorI.h | 2 +-
cpp/src/Ice/Instance.cpp | 4 ++--
cpp/src/Ice/Instance.h | 4 ++--
cpp/src/Ice/PluginManagerI.cpp | 6 +++---
cpp/src/Ice/PluginManagerI.h | 4 ++--
cpp/src/IceBox/ServiceManagerI.cpp | 4 ++--
cpp/src/IceBox/ServiceManagerI.h | 2 +-
cpp/src/IceUtil/DynamicLibrary.cpp | 22 +++++++++++-----------
11 files changed, 29 insertions(+), 29 deletions(-)
- Log -----------------------------------------------------------------
commit f376ea3d1d8d1805b0297c0d8146c4888c12386b
Author: Kevin P. Fleming <kpfleming at digium.com>
Date: Sat Mar 12 16:58:51 2011 -0600
DynamicLibrary should have been moved to the IceUtilInternal namespace,
not IceUtil.
diff --git a/cpp/include/IceUtil/DynamicLibrary.h b/cpp/include/IceUtil/DynamicLibrary.h
index 6b05415..32aac97 100644
--- a/cpp/include/IceUtil/DynamicLibrary.h
+++ b/cpp/include/IceUtil/DynamicLibrary.h
@@ -13,7 +13,7 @@
#include <IceUtil/DynamicLibraryF.h>
#include <IceUtil/Shared.h>
-namespace IceUtil
+namespace IceUtilInternal
{
class ICE_UTIL_API DynamicLibrary : public ::IceUtil::Shared
diff --git a/cpp/include/IceUtil/DynamicLibraryF.h b/cpp/include/IceUtil/DynamicLibraryF.h
index 1cd4b46..fd9fac4 100644
--- a/cpp/include/IceUtil/DynamicLibraryF.h
+++ b/cpp/include/IceUtil/DynamicLibraryF.h
@@ -14,16 +14,16 @@
#include <Ice/Handle.h>
-namespace IceUtil
+namespace IceUtilInternal
{
class DynamicLibrary;
ICE_UTIL_API IceUtil::Shared* upCast(DynamicLibrary*);
-typedef Handle<DynamicLibrary> DynamicLibraryPtr;
+typedef IceUtil::Handle<DynamicLibrary> DynamicLibraryPtr;
class DynamicLibraryList;
ICE_UTIL_API IceUtil::Shared* upCast(DynamicLibraryList*);
-typedef Handle<DynamicLibraryList> DynamicLibraryListPtr;
+typedef IceUtil::Handle<DynamicLibraryList> DynamicLibraryListPtr;
}
diff --git a/cpp/src/Ice/CommunicatorI.cpp b/cpp/src/Ice/CommunicatorI.cpp
index 872b488..4348b48 100644
--- a/cpp/src/Ice/CommunicatorI.cpp
+++ b/cpp/src/Ice/CommunicatorI.cpp
@@ -386,7 +386,7 @@ Ice::CommunicatorI::CommunicatorI(const InitializationData& initData)
// the libraries are not unloaded until this Communicator's
// destructor is invoked.
//
- const_cast<IceUtil::DynamicLibraryListPtr&>(_dynamicLibraryList) = _instance->dynamicLibraryList();
+ const_cast<IceUtilInternal::DynamicLibraryListPtr&>(_dynamicLibraryList) = _instance->dynamicLibraryList();
//
// If this is the first communicator that is created, use that communicator's
diff --git a/cpp/src/Ice/CommunicatorI.h b/cpp/src/Ice/CommunicatorI.h
index bc3d65c..96758bc 100644
--- a/cpp/src/Ice/CommunicatorI.h
+++ b/cpp/src/Ice/CommunicatorI.h
@@ -94,7 +94,7 @@ private:
// We don't want the dynamic libraries to be unloaded until the
// Communicator's destructor is invoked.
//
- const ::IceUtil::DynamicLibraryListPtr _dynamicLibraryList;
+ const ::IceUtilInternal::DynamicLibraryListPtr _dynamicLibraryList;
};
}
diff --git a/cpp/src/Ice/Instance.cpp b/cpp/src/Ice/Instance.cpp
index 300019c..ad0f8fa 100644
--- a/cpp/src/Ice/Instance.cpp
+++ b/cpp/src/Ice/Instance.cpp
@@ -335,7 +335,7 @@ IceInternal::Instance::endpointFactoryManager() const
return _endpointFactoryManager;
}
-IceUtil::DynamicLibraryListPtr
+IceUtilInternal::DynamicLibraryListPtr
IceInternal::Instance::dynamicLibraryList() const
{
IceUtil::RecMutex::Lock sync(*this);
@@ -978,7 +978,7 @@ IceInternal::Instance::Instance(const CommunicatorPtr& communicator, const Initi
EndpointFactoryPtr udpEndpointFactory = new UdpEndpointFactory(this);
_endpointFactoryManager->add(udpEndpointFactory);
- _dynamicLibraryList = new IceUtil::DynamicLibraryList;
+ _dynamicLibraryList = new IceUtilInternal::DynamicLibraryList;
_pluginManager = new PluginManagerI(communicator, _dynamicLibraryList);
diff --git a/cpp/src/Ice/Instance.h b/cpp/src/Ice/Instance.h
index 1e1c1f3..d22c0cd 100644
--- a/cpp/src/Ice/Instance.h
+++ b/cpp/src/Ice/Instance.h
@@ -73,7 +73,7 @@ public:
RetryQueuePtr retryQueue();
IceUtil::TimerPtr timer();
EndpointFactoryManagerPtr endpointFactoryManager() const;
- IceUtil::DynamicLibraryListPtr dynamicLibraryList() const;
+ IceUtilInternal::DynamicLibraryListPtr dynamicLibraryList() const;
Ice::PluginManagerPtr pluginManager() const;
size_t messageSizeMax() const { return _messageSizeMax; }
Ice::Int clientACM() const;
@@ -134,7 +134,7 @@ private:
RetryQueuePtr _retryQueue;
IceUtil::TimerPtr _timer;
EndpointFactoryManagerPtr _endpointFactoryManager;
- IceUtil::DynamicLibraryListPtr _dynamicLibraryList;
+ IceUtilInternal::DynamicLibraryListPtr _dynamicLibraryList;
Ice::PluginManagerPtr _pluginManager;
const Ice::ImplicitContextIPtr _implicitContext;
Ice::ObjectAdapterPtr _adminAdapter;
diff --git a/cpp/src/Ice/PluginManagerI.cpp b/cpp/src/Ice/PluginManagerI.cpp
index db1522d..2cfb6cc 100644
--- a/cpp/src/Ice/PluginManagerI.cpp
+++ b/cpp/src/Ice/PluginManagerI.cpp
@@ -172,7 +172,7 @@ Ice::PluginManagerI::destroy()
_libraries = 0;
}
-Ice::PluginManagerI::PluginManagerI(const CommunicatorPtr& communicator, const IceUtil::DynamicLibraryListPtr& libraries) :
+Ice::PluginManagerI::PluginManagerI(const CommunicatorPtr& communicator, const IceUtilInternal::DynamicLibraryListPtr& libraries) :
_communicator(communicator),
_libraries(libraries),
_initialized(false)
@@ -343,8 +343,8 @@ Ice::PluginManagerI::loadPlugin(const string& name, const string& pluginSpec, St
// Load the entry point symbol.
//
PluginPtr plugin;
- IceUtil::DynamicLibraryPtr library = new IceUtil::DynamicLibrary();
- IceUtil::DynamicLibrary::symbol_type sym = library->loadEntryPoint(entryPoint);
+ IceUtilInternal::DynamicLibraryPtr library = new IceUtilInternal::DynamicLibrary();
+ IceUtilInternal::DynamicLibrary::symbol_type sym = library->loadEntryPoint(entryPoint);
if(sym == 0)
{
ostringstream out;
diff --git a/cpp/src/Ice/PluginManagerI.h b/cpp/src/Ice/PluginManagerI.h
index 01f5c1a..7507be9 100644
--- a/cpp/src/Ice/PluginManagerI.h
+++ b/cpp/src/Ice/PluginManagerI.h
@@ -40,7 +40,7 @@ public:
private:
- PluginManagerI(const CommunicatorPtr&, const IceUtil::DynamicLibraryListPtr&);
+ PluginManagerI(const CommunicatorPtr&, const IceUtilInternal::DynamicLibraryListPtr&);
friend class IceInternal::Instance;
friend void IceInternal::loadPlugin(const Ice::CommunicatorPtr&, const std::string&, const std::string&,
Ice::StringSeq&);
@@ -49,7 +49,7 @@ private:
void loadPlugin(const std::string&, const std::string&, StringSeq&);
CommunicatorPtr _communicator;
- IceUtil::DynamicLibraryListPtr _libraries;
+ IceUtilInternal::DynamicLibraryListPtr _libraries;
std::map<std::string, PluginPtr> _plugins;
std::vector<PluginPtr> _initOrder;
diff --git a/cpp/src/IceBox/ServiceManagerI.cpp b/cpp/src/IceBox/ServiceManagerI.cpp
index 515467f..6a636c6 100644
--- a/cpp/src/IceBox/ServiceManagerI.cpp
+++ b/cpp/src/IceBox/ServiceManagerI.cpp
@@ -577,8 +577,8 @@ IceBox::ServiceManagerI::start(const string& service, const string& entryPoint,
//
// Load the entry point.
//
- IceUtil::DynamicLibraryPtr library = new IceUtil::DynamicLibrary();
- IceUtil::DynamicLibrary::symbol_type sym = library->loadEntryPoint(entryPoint, false);
+ IceUtilInternal::DynamicLibraryPtr library = new IceUtilInternal::DynamicLibrary();
+ IceUtilInternal::DynamicLibrary::symbol_type sym = library->loadEntryPoint(entryPoint, false);
if(sym == 0)
{
string msg = library->getErrorMessage();
diff --git a/cpp/src/IceBox/ServiceManagerI.h b/cpp/src/IceBox/ServiceManagerI.h
index a8bd060..2813680 100644
--- a/cpp/src/IceBox/ServiceManagerI.h
+++ b/cpp/src/IceBox/ServiceManagerI.h
@@ -56,7 +56,7 @@ private:
{
::std::string name;
ServicePtr service;
- ::IceUtil::DynamicLibraryPtr library;
+ ::IceUtilInternal::DynamicLibraryPtr library;
::Ice::CommunicatorPtr communicator;
::std::string envName;
ServiceStatus status;
diff --git a/cpp/src/IceUtil/DynamicLibrary.cpp b/cpp/src/IceUtil/DynamicLibrary.cpp
index c22beea..b60ca99 100644
--- a/cpp/src/IceUtil/DynamicLibrary.cpp
+++ b/cpp/src/IceUtil/DynamicLibrary.cpp
@@ -17,15 +17,15 @@
using namespace Ice;
using namespace std;
-IceUtil::Shared* IceUtil::upCast(DynamicLibrary* p) { return p; }
-IceUtil::Shared* IceUtil::upCast(DynamicLibraryList* p) { return p; }
+IceUtil::Shared* IceUtilInternal::upCast(DynamicLibrary* p) { return p; }
+IceUtil::Shared* IceUtilInternal::upCast(DynamicLibraryList* p) { return p; }
-IceUtil::DynamicLibrary::DynamicLibrary()
+IceUtilInternal::DynamicLibrary::DynamicLibrary()
: _hnd(0)
{
}
-IceUtil::DynamicLibrary::~DynamicLibrary()
+IceUtilInternal::DynamicLibrary::~DynamicLibrary()
{
/*
* Closing the library here can cause a crash at program exit if
@@ -44,8 +44,8 @@ IceUtil::DynamicLibrary::~DynamicLibrary()
*/
}
-IceUtil::DynamicLibrary::symbol_type
-IceUtil::DynamicLibrary::loadEntryPoint(const string& entryPoint, bool useIceVersion)
+IceUtilInternal::DynamicLibrary::symbol_type
+IceUtilInternal::DynamicLibrary::loadEntryPoint(const string& entryPoint, bool useIceVersion)
{
string::size_type colon = entryPoint.rfind(':');
string::size_type comma = entryPoint.find(',');
@@ -151,7 +151,7 @@ IceUtil::DynamicLibrary::loadEntryPoint(const string& entryPoint, bool useIceVer
}
bool
-IceUtil::DynamicLibrary::load(const string& lib)
+IceUtilInternal::DynamicLibrary::load(const string& lib)
{
#ifdef _WIN32
_hnd = LoadLibrary(lib.c_str());
@@ -179,8 +179,8 @@ IceUtil::DynamicLibrary::load(const string& lib)
return _hnd != 0;
}
-IceUtil::DynamicLibrary::symbol_type
-IceUtil::DynamicLibrary::getSymbol(const string& name)
+IceUtilInternal::DynamicLibrary::symbol_type
+IceUtilInternal::DynamicLibrary::getSymbol(const string& name)
{
assert(_hnd != 0);
#ifdef _WIN32
@@ -208,13 +208,13 @@ IceUtil::DynamicLibrary::getSymbol(const string& name)
}
const string&
-IceUtil::DynamicLibrary::getErrorMessage() const
+IceUtilInternal::DynamicLibrary::getErrorMessage() const
{
return _err;
}
void
-IceUtil::DynamicLibraryList::add(const DynamicLibraryPtr& library)
+IceUtilInternal::DynamicLibraryList::add(const DynamicLibraryPtr& library)
{
_libraries.push_back(library);
}
-----------------------------------------------------------------------
--
asterisk-scf/integration/ice.git
More information about the asterisk-scf-commits
mailing list