From 0730be7c303ac415484b15ef44ff1dce077a93b8 Mon Sep 17 00:00:00 2001 From: ethannicholas Date: Thu, 1 Sep 2016 07:59:02 -0700 Subject: 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 --- src/sksl/SkSLIRGenerator.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/sksl/SkSLIRGenerator.cpp') 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 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"); -- cgit v1.2.3