From 732b17a2c44343aa49e7382e8840b8d93b683bb3 Mon Sep 17 00:00:00 2001 From: Cristian Adam Date: Wed, 29 Apr 2020 19:12:04 +0200 Subject: [PATCH] qtcreatorcdbext: use std::unique_ptr instead of std::auto_ptr Qt6 will require C++17, which has removed std::auto_ptr Change-Id: I4f87ce0196799269735a878592ef3e930e94d4fc Reviewed-by: David Schulz --- src/libs/qtcreatorcdbext/extensioncontext.h | 4 ++-- src/libs/qtcreatorcdbext/symbolgroup.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/libs/qtcreatorcdbext/extensioncontext.h b/src/libs/qtcreatorcdbext/extensioncontext.h index e1a27f3a9ae..db099c17ca2 100644 --- a/src/libs/qtcreatorcdbext/extensioncontext.h +++ b/src/libs/qtcreatorcdbext/extensioncontext.h @@ -137,8 +137,8 @@ private: bool isInitialized() const; IInterfacePointer m_control; - std::auto_ptr m_symbolGroup; - std::auto_ptr m_watchesSymbolGroup; + std::unique_ptr m_symbolGroup; + std::unique_ptr m_watchesSymbolGroup; CIDebugClient *m_hookedClient = nullptr; IDebugEventCallbacks *m_oldEventCallback = nullptr; diff --git a/src/libs/qtcreatorcdbext/symbolgroup.cpp b/src/libs/qtcreatorcdbext/symbolgroup.cpp index 0d55fb6a39b..6bc08506b40 100644 --- a/src/libs/qtcreatorcdbext/symbolgroup.cpp +++ b/src/libs/qtcreatorcdbext/symbolgroup.cpp @@ -227,7 +227,7 @@ std::string SymbolGroup::debug(const std::string &iname, { std::ostringstream str; str << '\n'; - std::auto_ptr + std::unique_ptr visitor(filter.empty() ? new DebugSymbolGroupNodeVisitor(str, verbosity) : new DebugFilterSymbolGroupNodeVisitor(str, filter, verbosity));