diff options
| author |  Mike Klein <mtklein@chromium.org> | 2018-06-12 11:05:16 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-06-12 15:47:53 +0000 |
| commit | 22ce79400dcce8571c56f97d717f8d21675ee000 (patch) | |
| tree | 1485687f95137d21b60d986df054ff7aae27a8f8 /include | |
| parent | b82c3d6ff2ac62c8a14b38b0d658a51e7d8cf81e (diff) | |
remove __cplusplus guard
The file cannot be used as a C header anyway.
Change-Id: Ic33341fce894e48fb0a50b8c7a14c32b59dc9223
Reviewed-on: https://skia-review.googlesource.com/134321
Reviewed-by: Mike Klein <mtklein@chromium.org>
Reviewed-by: Ben Wagner <bungeman@google.com>
Commit-Queue: Mike Klein <mtklein@chromium.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/core/SkTypes.h | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/include/core/SkTypes.h b/include/core/SkTypes.h index a4dcc3cc37..db694e9f8b 100644 --- a/include/core/SkTypes.h +++ b/include/core/SkTypes.h @@ -17,6 +17,7 @@ // IWYU pragma: end_exports #include <string.h> +#include <utility> /** \file SkTypes.h */ @@ -228,13 +229,6 @@ typedef uint32_t SkMSec; */ #define SK_InvalidUniqueID 0 -/**************************************************************************** - The rest of these only build with C++ -*/ -#ifdef __cplusplus - -#include <utility> - /** Generic swap function. Classes with efficient swaps should specialize this function to take their fast path. This function is used by SkTSort. */ template <typename T> static inline void SkTSwap(T& a, T& b) { @@ -342,6 +336,4 @@ public: SkNoncopyable& operator=(const SkNoncopyable&) = delete; }; -#endif /* C++ */ - #endif |