From 6da02771fb8295bba3e6236b1c2d8994f6d5e13c Mon Sep 17 00:00:00 2001 From: Sam McCall Date: Mon, 9 Jul 2018 10:43:32 +0000 Subject: [PATCH] [Support] Fix GCC compile after r336534 git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@336537 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/llvm/Support/JSON.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/include/llvm/Support/JSON.h b/include/llvm/Support/JSON.h index 640d302dfab..767e25a8dd2 100644 --- a/include/llvm/Support/JSON.h +++ b/include/llvm/Support/JSON.h @@ -163,11 +163,12 @@ public: V.emplace_back(std::forward(A)...); } void pop_back() { V.pop_back(); } - iterator insert(const_iterator P, const Value &E) { return V.insert(P, E); } - iterator insert(const_iterator P, Value &&E) { + // FIXME: insert() takes const_iterator since C++11, old libstdc++ disagrees. + iterator insert(iterator P, const Value &E) { return V.insert(P, E); } + iterator insert(iterator P, Value &&E) { return V.insert(P, std::move(E)); } - template iterator insert(const_iterator P, It A, It Z) { + template iterator insert(iterator P, It A, It Z) { return V.insert(P, A, Z); } template iterator emplace(const_iterator P, Args &&... A) { -- 2.11.0