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/Database.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/Database.cpp')
| -rw-r--r-- | cpp/src/IceGrid/Database.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/cpp/src/IceGrid/Database.cpp b/cpp/src/IceGrid/Database.cpp index 5c9167b784d..ce458e52936 100644 --- a/cpp/src/IceGrid/Database.cpp +++ b/cpp/src/IceGrid/Database.cpp @@ -713,8 +713,8 @@ Database::updateApplication(const ApplicationUpdateInfo& updt, bool noRestart, A ApplicationInfo oldApp; ApplicationUpdateInfo update = updt; - IceUtil::UniquePtr<ApplicationHelper> previous; - IceUtil::UniquePtr<ApplicationHelper> helper; + IceInternal::UniquePtr<ApplicationHelper> previous; + IceInternal::UniquePtr<ApplicationHelper> helper; try { Lock sync(*this); @@ -755,8 +755,8 @@ Database::syncApplicationDescriptor(const ApplicationDescriptor& newDesc, bool n ApplicationUpdateInfo update; ApplicationInfo oldApp; - IceUtil::UniquePtr<ApplicationHelper> previous; - IceUtil::UniquePtr<ApplicationHelper> helper; + IceInternal::UniquePtr<ApplicationHelper> previous; + IceInternal::UniquePtr<ApplicationHelper> helper; try { Lock sync(*this); @@ -800,8 +800,8 @@ Database::instantiateServer(const string& application, ApplicationUpdateInfo update; ApplicationInfo oldApp; - IceUtil::UniquePtr<ApplicationHelper> previous; - IceUtil::UniquePtr<ApplicationHelper> helper; + IceInternal::UniquePtr<ApplicationHelper> previous; + IceInternal::UniquePtr<ApplicationHelper> helper; try { |