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/DescriptorParser.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/DescriptorParser.cpp')
| -rw-r--r-- | cpp/src/IceGrid/DescriptorParser.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/cpp/src/IceGrid/DescriptorParser.cpp b/cpp/src/IceGrid/DescriptorParser.cpp index 173cdb72011..8e8d96542d0 100644 --- a/cpp/src/IceGrid/DescriptorParser.cpp +++ b/cpp/src/IceGrid/DescriptorParser.cpp @@ -61,15 +61,15 @@ private: int _line; int _column; - IceUtil::UniquePtr<ApplicationDescriptorBuilder> _currentApplication; - IceUtil::UniquePtr<NodeDescriptorBuilder> _currentNode; - IceUtil::UniquePtr<TemplateDescriptorBuilder> _currentTemplate; - IceUtil::UniquePtr<ServerInstanceDescriptorBuilder> _currentServerInstance; - IceUtil::UniquePtr<ServiceInstanceDescriptorBuilder> _currentServiceInstance; - IceUtil::UniquePtr<ServerDescriptorBuilder> _currentServer; - IceUtil::UniquePtr<ServiceDescriptorBuilder> _currentService; + IceInternal::UniquePtr<ApplicationDescriptorBuilder> _currentApplication; + IceInternal::UniquePtr<NodeDescriptorBuilder> _currentNode; + IceInternal::UniquePtr<TemplateDescriptorBuilder> _currentTemplate; + IceInternal::UniquePtr<ServerInstanceDescriptorBuilder> _currentServerInstance; + IceInternal::UniquePtr<ServiceInstanceDescriptorBuilder> _currentServiceInstance; + IceInternal::UniquePtr<ServerDescriptorBuilder> _currentServer; + IceInternal::UniquePtr<ServiceDescriptorBuilder> _currentService; CommunicatorDescriptorBuilder* _currentCommunicator; - IceUtil::UniquePtr<PropertySetDescriptorBuilder> _currentPropertySet; + IceInternal::UniquePtr<PropertySetDescriptorBuilder> _currentPropertySet; bool _isTopLevel; bool _inAdapter; |