[llvm] r336537 - [Support] Fix GCC compile after r336534
Sam McCall via llvm-commits
llvm-commits at lists.llvm.org
Mon Jul 9 03:43:32 PDT 2018
Author: sammccall
Date: Mon Jul 9 03:43:32 2018
New Revision: 336537
URL: http://llvm.org/viewvc/llvm-project?rev=336537&view=rev
Log:
[Support] Fix GCC compile after r336534
Modified:
llvm/trunk/include/llvm/Support/JSON.h
Modified: llvm/trunk/include/llvm/Support/JSON.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Support/JSON.h?rev=336537&r1=336536&r2=336537&view=diff
==============================================================================
--- llvm/trunk/include/llvm/Support/JSON.h (original)
+++ llvm/trunk/include/llvm/Support/JSON.h Mon Jul 9 03:43:32 2018
@@ -163,11 +163,12 @@ public:
V.emplace_back(std::forward<Args>(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 <typename It> iterator insert(const_iterator P, It A, It Z) {
+ template <typename It> iterator insert(iterator P, It A, It Z) {
return V.insert(P, A, Z);
}
template <typename... Args> iterator emplace(const_iterator P, Args &&... A) {
More information about the llvm-commits
mailing list