| Index: src/animator/SkMemberInfo.h
|
| diff --git a/src/animator/SkMemberInfo.h b/src/animator/SkMemberInfo.h
|
| index b62de663d49b23d9485532c8314350e2b522c84d..709d66ac84f4548a4f720f23b7b29200bd436f52 100644
|
| --- a/src/animator/SkMemberInfo.h
|
| +++ b/src/animator/SkMemberInfo.h
|
| @@ -18,6 +18,7 @@
|
| #include "SkScript.h"
|
| #include "SkString.h"
|
| #include "SkIntArray.h"
|
| +#include <utility>
|
|
|
| class SkAnimateMaker;
|
| class SkDisplayable;
|
| @@ -111,11 +112,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, \
|
|
|