Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(30)

Unified Diff: src/animator/SkMemberInfo.h

Issue 1561683002: Start using <type_traits> and <utility> (C++11). (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Fix skstd::unique_ptr::compressed_pair. Created 4 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « include/private/SkUtility.h ('k') | src/core/SkDraw.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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, \
« no previous file with comments | « include/private/SkUtility.h ('k') | src/core/SkDraw.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698