diff options
| author | Bernard Normier <bernard@zeroc.com> | 2017-01-11 16:15:49 -0500 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2017-01-11 16:15:49 -0500 |
| commit | f6a5299766fe3db2273afd78f145486b091513ed (patch) | |
| tree | 87eead6b9fa33e43f7b863093fd410167d9cb23a /cpp/src/IceGrid/LocatorI.cpp | |
| parent | Fixed Glacier2/router IE browser test failure (diff) | |
| download | ice-f6a5299766fe3db2273afd78f145486b091513ed.tar.bz2 ice-f6a5299766fe3db2273afd78f145486b091513ed.tar.xz ice-f6a5299766fe3db2273afd78f145486b091513ed.zip | |
Moved UniquePtr to IceInternal
Removed ctor and assignment operator from UniquePtr
Diffstat (limited to 'cpp/src/IceGrid/LocatorI.cpp')
| -rw-r--r-- | cpp/src/IceGrid/LocatorI.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cpp/src/IceGrid/LocatorI.cpp b/cpp/src/IceGrid/LocatorI.cpp index 1ca7a9645d6..575ebe71fd4 100644 --- a/cpp/src/IceGrid/LocatorI.cpp +++ b/cpp/src/IceGrid/LocatorI.cpp @@ -454,7 +454,7 @@ private: unsigned int _count; LocatorAdapterInfoSeq::const_iterator _lastAdapter; std::map<std::string, Ice::ObjectPrx> _proxies; - IceUtil::UniquePtr<Ice::Exception> _exception; + IceInternal::UniquePtr<Ice::Exception> _exception; }; class RoundRobinRequest : public LocatorI::Request, SynchronizationCallback, public IceUtil::Mutex @@ -752,7 +752,7 @@ private: bool _waitForActivation; set<string> _failed; set<string> _activatingOrFailed; - IceUtil::UniquePtr<Ice::Exception> _exception; + IceInternal::UniquePtr<Ice::Exception> _exception; }; class FindAdapterByIdCallback : public SynchronizationCallback |