AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert "In older STLs, std::vector::insert() returns void."

Browse Source 
This reverts commit 7dd8ee9c60.

Reason for revert: going to revert primary CL

Original change's description:
> 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 <brianosman@google.com>
> Commit-Queue: Mike Klein <mtklein@chromium.org>

TBR=mtklein@chromium.org,brianosman@google.com

Change-Id: I9c126edbef74293d8e7a2b7e2365e464ba367ae5
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Cq-Include-Trybots: skia.primary:Build-Debian9-Clang-arm-Debug-Chromebook_GLES
Reviewed-on: https://skia-review.googlesource.com/117900
Reviewed-by: Mike Klein <mtklein@chromium.org>
Commit-Queue: Mike Klein <mtklein@chromium.org>
This commit is contained in:
Mike Klein 2018-04-02 20:37:00 +00:00 committed by Skia Commit-Bot
parent 211cf7787c
commit 224edf0a3c
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/private/SkTDArray.h
View File

@ -72,12 +72,10 @@ public:
}
T* insert(int ix, int n = 1, const T* src = nullptr) {
if (src) {
fVec.insert(fVec.begin() + SkToSizeT(ix), src, src+SkToSizeT(n));
} else {
T v;
fVec.insert(fVec.begin() + SkToSizeT(ix), SkToSizeT(n), v);
return &*fVec.insert(fVec.begin() + SkToSizeT(ix), src, src+SkToSizeT(n));
}
return &this->getAt(ix);
T v;
return &*fVec.insert(fVec.begin() + SkToSizeT(ix), SkToSizeT(n), v);
}
void remove(int ix, int n = 1) {