From 7dd8ee9c6091fe51c9d337c06d6243731a0aafb3 Mon Sep 17 00:00:00 2001 From: Mike Klein Date: Mon, 2 Apr 2018 12:26:51 -0400 Subject: In older STLs, std::vector::insert() returns void. CQ_INCLUDE_TRYBOTS=skia.primary:Build-Debian9-Clang-arm-Debug-Chromebook_GLES Change-Id: I7bd15ecc7122965db16fbb51e51ee166b05dce2f Reviewed-on: https://skia-review.googlesource.com/117722 Reviewed-by: Brian Osman Commit-Queue: Mike Klein --- include/private/SkTDArray.h | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'include/private') diff --git a/include/private/SkTDArray.h b/include/private/SkTDArray.h index e9660d88b7..b841eaf6d3 100644 --- a/include/private/SkTDArray.h +++ b/include/private/SkTDArray.h @@ -72,10 +72,12 @@ public: } T* insert(int ix, int n = 1, const T* src = nullptr) { if (src) { - return &*fVec.insert(fVec.begin() + SkToSizeT(ix), src, src+SkToSizeT(n)); + fVec.insert(fVec.begin() + SkToSizeT(ix), src, src+SkToSizeT(n)); + } else { + T v; + fVec.insert(fVec.begin() + SkToSizeT(ix), SkToSizeT(n), v); } - T v; - return &*fVec.insert(fVec.begin() + SkToSizeT(ix), SkToSizeT(n), v); + return &this->getAt(ix); } void remove(int ix, int n = 1) { -- cgit v1.2.3