| Index: src/animator/SkMemberInfo.h
|
| diff --git a/src/animator/SkMemberInfo.h b/src/animator/SkMemberInfo.h
|
| index b62de663d49b23d9485532c8314350e2b522c84d..df4d0f2ce119ace77775c5fb1421150f1ff798a2 100644
|
| --- a/src/animator/SkMemberInfo.h
|
| +++ b/src/animator/SkMemberInfo.h
|
| @@ -19,6 +19,8 @@
|
| #include "SkString.h"
|
| #include "SkIntArray.h"
|
|
|
| +#include <utility>
|
| +
|
| class SkAnimateMaker;
|
| class SkDisplayable;
|
| class SkScriptEngine;
|
| @@ -111,11 +113,11 @@ struct SkMemberInfo {
|
|
|
| #define SK_MEMBER(_member, _type) \
|
| { #_member, SK_OFFSETOF(BASE_CLASS, _member), SkType_##_type, \
|
| - sizeof(skstd::declval<BASE_CLASS>()._member) / sizeof(SkScalar) }
|
| + sizeof(std::declval<BASE_CLASS>()._member) / sizeof(SkScalar) }
|
|
|
| #define SK_MEMBER_ALIAS(_member, _alias, _type) \
|
| { #_member, SK_OFFSETOF(BASE_CLASS, _alias), SkType_##_type, \
|
| - sizeof(skstd::declval<BASE_CLASS>()._alias) / sizeof(SkScalar) }
|
| + sizeof(std::declval<BASE_CLASS>()._alias) / sizeof(SkScalar) }
|
|
|
| #define SK_MEMBER_ARRAY(_member, _type) \
|
| { #_member, SK_OFFSETOF(BASE_CLASS, _member), SkType_Array, \
|
|
|