feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Clang: Do not derive deprecated std::iterator

Browse Source 
Reported by MSVC.

Change-Id: If89d1c41c7b52e48d01d0d4251c85de4785c73ec
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
Orgad Shaneh
2020-11-11 12:40:19 +02:00
committed by Orgad Shaneh
parent b1640074e3
commit 1e8ed5092d
2 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/tools/clangbackend/source/diagnosticsetiterator.h
View File

@@ -37,9 +37,15 @@ using uint = unsigned int;
class DiagnosticSet;
class DiagnosticSetIterator : public std::iterator<std::random_access_iterator_tag, Diagnostic, uint>
class DiagnosticSetIterator
{
public:
using iterator_category = std::random_access_iterator_tag;
using value_type = Diagnostic;
using difference_type = uint;
using pointer = Diagnostic *;
using reference = Diagnostic &;
DiagnosticSetIterator(CXTranslationUnit translationUnit,
CXDiagnosticSet cxDiagnosticSet,
uint index)

8
src/tools/clangbackend/source/tokenprocessoriterator.h
View File

@@ -38,9 +38,15 @@ class DiagnosticSet;
class Diagnostic;
template<class T>
class TokenProcessorIterator : public std::iterator<std::forward_iterator_tag, TokenInfo, uint>
class TokenProcessorIterator
{
public:
using iterator_category = std::forward_iterator_tag;
using value_type = TokenInfo;
using difference_type = int;
using pointer = TokenInfo *;
using reference = TokenInfo &;
TokenProcessorIterator(std::vector<Cursor>::const_iterator cursorIterator,
std::vector<Token>::const_iterator tokenIterator,
std::vector<CXSourceRange> &currentOutputArgumentRanges)