diff options
| author |  bungeman <bungeman@google.com> | 2015-08-28 07:09:20 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-08-28 07:09:20 -0700 |
| commit | 761cf6186e291ee8e4761e1280634cfe9c42eccc (patch) | |
| tree | b56219f2b42b8816fac623ef3e549761f3d49f25 /src/gpu/effects | |
| parent | 4204800cd8f311f11491cf2eb7e32ca681f05489 (diff) | |
Clean up SkTLogic.
This change regularizes Skia's type traits so that when <type_traits>
can finally be used the transition is easier. Various traits are
renamed to match <type_traits> and placed in the skstd namespace.
Current users of these traits are updated.
Review URL: https://codereview.chromium.org/1317593004
Diffstat (limited to 'src/gpu/effects')
| -rw-r--r-- | src/gpu/effects/GrPorterDuffXferProcessor.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gpu/effects/GrPorterDuffXferProcessor.cpp b/src/gpu/effects/GrPorterDuffXferProcessor.cpp index ff857f4e0d..4c9af42cde 100644 --- a/src/gpu/effects/GrPorterDuffXferProcessor.cpp +++ b/src/gpu/effects/GrPorterDuffXferProcessor.cpp @@ -68,7 +68,7 @@ public: */ template<OutputType PrimaryOut, OutputType SecondaryOut, GrBlendEquation BlendEquation, GrBlendCoeff SrcCoeff, GrBlendCoeff DstCoeff> - struct get_properties : SkTIntegralConstant<Properties, static_cast<Properties>( + struct get_properties : skstd::integral_constant<Properties, static_cast<Properties>( (GR_BLEND_MODIFIES_DST(BlendEquation, SrcCoeff, DstCoeff) ? kModifiesDst_Property : 0) | |