From 1c2d41a63e83b2ea6516c42f1aeaedf181ea1708 Mon Sep 17 00:00:00 2001
From: Marco Bubke <marco.bubke@qt.io>
Date: Wed, 23 Jan 2019 16:22:54 +0100
Subject: [PATCH] ClangPchManager: Remove special back inserter

It was there because we supported very old compilers but I think that is
not anymore the case.

Change-Id: I15ea32f95a75b787f2681b71ed693a1525e5b7d3
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
---
 .../source/modifiedtimechecker.h              | 19 +------------------
 .../source/projectparts.cpp                   | 19 +------------------
 .../source/usedmacrofilter.h                  | 19 +------------------
 3 files changed, 3 insertions(+), 54 deletions(-)

diff --git a/src/tools/clangpchmanagerbackend/source/modifiedtimechecker.h b/src/tools/clangpchmanagerbackend/source/modifiedtimechecker.h
index 9d6e2bf6f6c..88d5f140d53 100644
--- a/src/tools/clangpchmanagerbackend/source/modifiedtimechecker.h
+++ b/src/tools/clangpchmanagerbackend/source/modifiedtimechecker.h
@@ -57,23 +57,6 @@ public:
     {
         using SourceTimeStampReferences = std::vector<std::reference_wrapper<SourceTimeStamp>>;
 
-        class BackInserterIterator : public std::back_insert_iterator<SourceTimeStampReferences>
-        {
-        public:
-            BackInserterIterator(SourceTimeStampReferences &container)
-                : std::back_insert_iterator<SourceTimeStampReferences>(container)
-            {}
-
-            BackInserterIterator &operator=(SourceTimeStamp &timeStamp)
-            {
-                container->push_back(std::ref(timeStamp));
-
-                return *this;
-            }
-
-            BackInserterIterator &operator*() { return *this; }
-        };
-
         SourceTimeStampReferences timeStampsToUpdate;
         timeStampsToUpdate.reserve(filePathIds.size());
 
@@ -81,7 +64,7 @@ public:
                               m_currentSourceTimeStamps.end(),
                               filePathIds.begin(),
                               filePathIds.end(),
-                              BackInserterIterator(timeStampsToUpdate));
+                              std::back_inserter(timeStampsToUpdate));
 
         for (SourceTimeStamp &sourceTimeStamp : timeStampsToUpdate) {
             sourceTimeStamp.lastModified = m_getModifiedTime(
diff --git a/src/tools/clangpchmanagerbackend/source/projectparts.cpp b/src/tools/clangpchmanagerbackend/source/projectparts.cpp
index a67c0721e00..e8df25e1042 100644
--- a/src/tools/clangpchmanagerbackend/source/projectparts.cpp
+++ b/src/tools/clangpchmanagerbackend/source/projectparts.cpp
@@ -70,23 +70,6 @@ void ProjectParts::updateDeferred(const ProjectPartContainers &deferredProjectsP
 {
     using ProjectPartContainerReferences = std::vector<std::reference_wrapper<ProjectPartContainer>>;
 
-    class BackInserterIterator : public std::back_insert_iterator<ProjectPartContainerReferences>
-    {
-    public:
-        BackInserterIterator(ProjectPartContainerReferences &container)
-            : std::back_insert_iterator<ProjectPartContainerReferences>(container)
-        {}
-
-        BackInserterIterator &operator=(ProjectPartContainer &projectPart)
-        {
-            container->push_back(std::ref(projectPart));
-
-            return *this;
-        }
-
-        BackInserterIterator &operator*() { return *this; }
-    };
-
     ProjectPartContainerReferences deferredProjectPartPointers;
     deferredProjectPartPointers.reserve(deferredProjectsParts.size());
 
@@ -94,7 +77,7 @@ void ProjectParts::updateDeferred(const ProjectPartContainers &deferredProjectsP
                           m_projectParts.end(),
                           deferredProjectsParts.begin(),
                           deferredProjectsParts.end(),
-                          BackInserterIterator(deferredProjectPartPointers),
+                          std::back_inserter(deferredProjectPartPointers),
                           [](const ProjectPartContainer &first, const ProjectPartContainer &second) {
                               return first.projectPartId < second.projectPartId;
                           });
diff --git a/src/tools/clangpchmanagerbackend/source/usedmacrofilter.h b/src/tools/clangpchmanagerbackend/source/usedmacrofilter.h
index 05e6a8eaf65..43af0b6488b 100644
--- a/src/tools/clangpchmanagerbackend/source/usedmacrofilter.h
+++ b/src/tools/clangpchmanagerbackend/source/usedmacrofilter.h
@@ -98,23 +98,6 @@ private:
 
     static UsedMacros filterUsedMarcos(const UsedMacros &usedMacros, const FilePathIds &filePathId)
     {
-        class BackInserterIterator : public std::back_insert_iterator<UsedMacros>
-        {
-        public:
-            BackInserterIterator(UsedMacros &container)
-                : std::back_insert_iterator<UsedMacros>(container)
-            {}
-
-            BackInserterIterator &operator=(const UsedMacro &usedMacro)
-            {
-                container->push_back(usedMacro);
-
-                return *this;
-            }
-
-            BackInserterIterator &operator*() { return *this; }
-        };
-
         struct Compare
         {
             bool operator()(const UsedMacro &usedMacro, FilePathId filePathId)
@@ -135,7 +118,7 @@ private:
                               usedMacros.end(),
                               filePathId.begin(),
                               filePathId.end(),
-                              BackInserterIterator(filtertedMacros),
+                              std::back_inserter(filtertedMacros),
                               Compare{});
 
         std::sort(filtertedMacros.begin(),