diff options
| author |  ethannicholas <ethannicholas@google.com> | 2016-09-01 07:59:02 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-09-01 07:59:02 -0700 |
| commit | 0730be7c303ac415484b15ef44ff1dce077a93b8 (patch) | |
| tree | 0e4c5ea09e3d90151add8473877ee5214c3f96cc /src/sksl/SkSLIRGenerator.cpp | |
| parent | 787e5a396f41c7e8d639f0fc5e70846cef6ac3ec (diff) | |
minor SkSL changes to avoid compiler errors in Chromium
* fixed a couple of spots where using { } instead of an explicit constructor call resulted in errors
* Type::Field had a deleted copy constructor and therefore was not working inside std::vector; had to remove const from fields and change fType from a reference to a pointer
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2300023002
Review-Url: https://codereview.chromium.org/2300023002
Diffstat (limited to 'src/sksl/SkSLIRGenerator.cpp')
| -rw-r--r-- | src/sksl/SkSLIRGenerator.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/sksl/SkSLIRGenerator.cpp b/src/sksl/SkSLIRGenerator.cpp index db033d63b9..9b0271b0bb 100644 --- a/src/sksl/SkSLIRGenerator.cpp +++ b/src/sksl/SkSLIRGenerator.cpp @@ -487,7 +487,7 @@ std::unique_ptr<InterfaceBlock> IRGenerator::convertInterfaceBlock(const ASTInte Variable::kGlobal_Storage); for (size_t j = 0; j < decl->fVars.size(); j++) { fields.push_back(Type::Field(decl->fVars[j]->fModifiers, decl->fVars[j]->fName, - decl->fVars[j]->fType)); + &decl->fVars[j]->fType)); if (decl->fValues[j]) { fErrors.error(decl->fPosition, "initializers are not permitted on interface block fields"); |