From 761cf6186e291ee8e4761e1280634cfe9c42eccc Mon Sep 17 00:00:00 2001
From: bungeman <bungeman@google.com>
Date: Fri, 28 Aug 2015 07:09:20 -0700
Subject: 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
---
src/gpu/effects/GrPorterDuffXferProcessor.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'src/gpu/effects')
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) |
--
cgit v1.2.3