summaryrefslogtreecommitdiff
path: root/cpp/src/IceGrid/DescriptorParser.cpp
diff options
context:
space:
mode:
authorBernard Normier <bernard@zeroc.com>2012-10-05 16:31:52 -0400
committerBernard Normier <bernard@zeroc.com>2012-10-05 16:31:52 -0400
commit0d20d608543547fd2a3abcc08210fb7910773e3d (patch)
tree33b4acb74e574e4cbced30693448fcd3808c8d9d /cpp/src/IceGrid/DescriptorParser.cpp
parentFixed ICE-4741 and minor add-in issues (diff)
downloadice-0d20d608543547fd2a3abcc08210fb7910773e3d.tar.bz2
ice-0d20d608543547fd2a3abcc08210fb7910773e3d.tar.xz
ice-0d20d608543547fd2a3abcc08210fb7910773e3d.zip
Port to gcc and clang in c++11 mode:
- for GCC, replaced most std::auto_ptr usage by a new IceUtil::UniquePtr - for clang, added ICE_NOEXCEPT and ICE_NOEXCEPT_FALSE for a few dtors in Freeze
Diffstat (limited to 'cpp/src/IceGrid/DescriptorParser.cpp')
-rw-r--r--cpp/src/IceGrid/DescriptorParser.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/cpp/src/IceGrid/DescriptorParser.cpp b/cpp/src/IceGrid/DescriptorParser.cpp
index 25a4b4786e9..22bb1f20111 100644
--- a/cpp/src/IceGrid/DescriptorParser.cpp
+++ b/cpp/src/IceGrid/DescriptorParser.cpp
@@ -61,15 +61,15 @@ private:
int _line;
int _column;
- auto_ptr<ApplicationDescriptorBuilder> _currentApplication;
- auto_ptr<NodeDescriptorBuilder> _currentNode;
- auto_ptr<TemplateDescriptorBuilder> _currentTemplate;
- auto_ptr<ServerInstanceDescriptorBuilder> _currentServerInstance;
- auto_ptr<ServiceInstanceDescriptorBuilder> _currentServiceInstance;
- auto_ptr<ServerDescriptorBuilder> _currentServer;
- auto_ptr<ServiceDescriptorBuilder> _currentService;
+ 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;
CommunicatorDescriptorBuilder* _currentCommunicator;
- auto_ptr<PropertySetDescriptorBuilder> _currentPropertySet;
+ IceUtil::UniquePtr<PropertySetDescriptorBuilder> _currentPropertySet;
bool _isTopLevel;
bool _inAdapter;