diff options
| author |  Ethan Nicholas <ethannicholas@google.com> | 2018-06-12 11:05:59 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-06-12 19:16:03 +0000 |
| commit | d9d33c33dee064da260301faa313703e465d44c5 (patch) | |
| tree | f2e9a592acde1715d71381d8ff7c97fdaf58edac /src/sksl/ir/SkSLSetting.h | |
| parent | 22be4c4801f957f2820b9001b02b892f4b87a157 (diff) | |
renamed SkSL's assert macros
Since SkSL needs to run outside of Skia, it was originally using its
own ASSERT macro, which mapped to SkASSERT when inside of Skia. This is
causing conflicts with one or two other ASSERT macros defined around
Skia, so to avoid that I am switching SkSL over to just use Skia's
standard naming for these macros.
Bug: skia:
Change-Id: I115435d7282da03d076c6080f7b13d1972b9eb9f
Reviewed-on: https://skia-review.googlesource.com/134322
Reviewed-by: Greg Daniel <egdaniel@google.com>
Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
Diffstat (limited to 'src/sksl/ir/SkSLSetting.h')
| -rw-r--r-- | src/sksl/ir/SkSLSetting.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/sksl/ir/SkSLSetting.h b/src/sksl/ir/SkSLSetting.h index f479ad167b..1396099102 100644 --- a/src/sksl/ir/SkSLSetting.h +++ b/src/sksl/ir/SkSLSetting.h @@ -22,7 +22,7 @@ struct Setting : public Expression { : INHERITED(offset, kSetting_Kind, value->fType) , fName(std::move(name)) , fValue(std::move(value)) { - ASSERT(fValue->isConstant()); + SkASSERT(fValue->isConstant()); } std::unique_ptr<Expression> constantPropagate(const IRGenerator& irGenerator, |