diff options
author | Benoit Foucher <benoit@zeroc.com> | 2006-10-18 14:13:41 +0000 |
---|---|---|
committer | Benoit Foucher <benoit@zeroc.com> | 2006-10-18 14:13:41 +0000 |
commit | 1d92e1be590b4241a99fc0320b7f21e5e89cf841 (patch) | |
tree | 1aac14ca891eb4c9a9e48b1f2302c19744b2a4ff /cpp/src/IceGrid/RegistryI.cpp | |
parent | Fix (diff) | |
download | ice-1d92e1be590b4241a99fc0320b7f21e5e89cf841.tar.bz2 ice-1d92e1be590b4241a99fc0320b7f21e5e89cf841.tar.xz ice-1d92e1be590b4241a99fc0320b7f21e5e89cf841.zip |
Fix
Diffstat (limited to 'cpp/src/IceGrid/RegistryI.cpp')
-rw-r--r-- | cpp/src/IceGrid/RegistryI.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/cpp/src/IceGrid/RegistryI.cpp b/cpp/src/IceGrid/RegistryI.cpp index 037097c5ca8..bc057f0dd1d 100644 --- a/cpp/src/IceGrid/RegistryI.cpp +++ b/cpp/src/IceGrid/RegistryI.cpp @@ -490,7 +490,7 @@ RegistryI::setupUserAccountMapper(const Ice::ObjectAdapterPtr& registryAdapter) void RegistryI::setupClientSessionFactory(const Ice::ObjectAdapterPtr& registryAdapter, const Ice::ObjectAdapterPtr& sessionManagerAdapter, - const LocatorPrx& locator, + const IceGrid::LocatorPrx& locator, bool nowarn) { _waitQueue = new WaitQueue(); // Used for for session allocation timeout. @@ -534,7 +534,7 @@ RegistryI::setupClientSessionFactory(const Ice::ObjectAdapterPtr& registryAdapte void RegistryI::setupAdminSessionFactory(const Ice::ObjectAdapterPtr& registryAdapter, const Ice::ObjectAdapterPtr& sessionManagerAdapter, - const LocatorPrx& locator, + const IceGrid::LocatorPrx& locator, bool nowarn) { assert(_reaper); @@ -920,7 +920,7 @@ RegistryI::setupThreadPool(const PropertiesPtr& properties, const string& name, Glacier2::PermissionsVerifierPrx RegistryI::getPermissionsVerifier(const ObjectAdapterPtr& adapter, - const LocatorPrx& locator, + const IceGrid::LocatorPrx& locator, const string& verifierProperty, const string& passwordsProperty, bool nowarn) @@ -1022,7 +1022,7 @@ RegistryI::getPermissionsVerifier(const ObjectAdapterPtr& adapter, } Glacier2::SSLPermissionsVerifierPrx -RegistryI::getSSLPermissionsVerifier(const LocatorPrx& locator, const string& verifierProperty, bool nowarn) +RegistryI::getSSLPermissionsVerifier(const IceGrid::LocatorPrx& locator, const string& verifierProperty, bool nowarn) { // // Get the permissions verifier, or create a default one if no |