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

Remove C++14 workaround code.

Browse Source 
We no longer support compiling in C++14, so we don't need these
workarounds anymore.

Change-Id: Idec5a90e98c242928182f4b32dd47459be8ca47f
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/541075
Reviewed-by: Arman Uguray <armansito@google.com>
Auto-Submit: John Stiles <johnstiles@google.com>
Commit-Queue: Arman Uguray <armansito@google.com>
This commit is contained in:
John Stiles 2022-05-17 21:43:31 -04:00 committed by SkCQ
parent 4b354dfb5b
commit 91e4c7847e
4 changed files with 4 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/sksl/DSLBlock.h
View File

@ -28,13 +28,7 @@ public:
template<class... Statements>
DSLBlock(Statements... statements) {
fStatements.reserve_back(sizeof...(statements));
// in C++17, we could just do:
// (fStatements.push_back(DSLStatement(statements.release()).release()), ...);
int unused[] =
{0,
(static_cast<void>(fStatements.push_back(DSLStatement(statements.release()).release())),
0)...};
static_cast<void>(unused);
((void)fStatements.push_back(DSLStatement(statements.release()).release()), ...);
}
DSLBlock(DSLBlock&& other) = default;

8
include/sksl/DSLCase.h
View File

@ -27,13 +27,7 @@ public:
DSLCase(DSLExpression value, Statements... statements)
: fValue(std::move(value)) {
fStatements.reserve_back(sizeof...(statements));
// in C++17, we could just do:
// (fStatements.push_back(DSLStatement(std::move(statements)).release()), ...);
int unused[] =
{0,
(static_cast<void>(fStatements.push_back(DSLStatement(std::move(statements)).release())),
0)...};
static_cast<void>(unused);
((void)fStatements.push_back(DSLStatement(std::move(statements)).release()), ...);
}
DSLCase(DSLExpression value, SkTArray<DSLStatement> statements,

5
include/sksl/DSLFunction.h
View File

@ -40,11 +40,8 @@ public:
Parameters&... parameters) {
SkTArray<DSLParameter*> parameterArray;
parameterArray.reserve_back(sizeof...(parameters));
(parameterArray.push_back(&parameters), ...);
// in C++17, we could just do:
// (parameterArray.push_back(&parameters), ...);
int unused[] = {0, (static_cast<void>(parameterArray.push_back(&parameters)), 0)...};
static_cast<void>(unused);
// We can't have a default parameter and a template parameter pack at the same time, so
// unfortunately we can't capture position from this overload.
this->init(modifiers, returnType, name, std::move(parameterArray), Position());

6
src/sksl/dsl/DSLCore.cpp
View File

@ -142,11 +142,7 @@ public:
static DSLPossibleExpression Call(const char* name, Args... args) {
SkSL::ExpressionArray argArray;
argArray.reserve_back(sizeof...(args));
// in C++17, we could just do:
// (argArray.push_back(args.release()), ...);
int unused[] = {0, (static_cast<void>(argArray.push_back(args.release())), 0)...};
static_cast<void>(unused);
((void)argArray.push_back(args.release()), ...);
return SkSL::FunctionCall::Convert(ThreadContext::Context(), Position(),
ThreadContext::Compiler().convertIdentifier(Position(), name),