diff options
| author |  Herb Derby <herb@google.com> | 2017-03-27 13:35:15 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-03-27 18:13:07 +0000 |
| commit | b549cc38c8404c58642ada75c0b24907702cc005 (patch) | |
| tree | 4d3d04ea34532b9f15a62c46e2ca68e0dccbd520 /include/private | |
| parent | c0b642ca48d58416409e555549434066f09692b7 (diff) | |
Change SkMemory to the more accurately named SkMalloc.
Change-Id: I6b08a74234b99bac866bad71014b94f7ec2d4bc8
Reviewed-on: https://skia-review.googlesource.com/10188
Commit-Queue: Herb Derby <herb@google.com>
Reviewed-by: Brian Salomon <bsalomon@google.com>
Diffstat (limited to 'include/private')
| -rw-r--r-- | include/private/SkMalloc.h (renamed from include/private/SkMemory.h) | 6 | ||||
| -rw-r--r-- | include/private/SkTDArray.h | 2 | ||||
| -rw-r--r-- | include/private/SkTemplates.h | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/include/private/SkMemory.h b/include/private/SkMalloc.h index 02ad0ce52e..58e11f657c 100644 --- a/include/private/SkMemory.h +++ b/include/private/SkMalloc.h @@ -5,8 +5,8 @@ * found in the LICENSE file. */ -#ifndef SkMemory_DEFINED -#define SkMemory_DEFINED +#ifndef SkMalloc_DEFINED +#define SkMalloc_DEFINED #include <cstddef> #include <cstring> @@ -81,4 +81,4 @@ static inline void* sk_careful_memcpy(void* dst, const void* src, size_t len) { return dst; } -#endif //SkMemory_DEFINED +#endif // SkMalloc_DEFINED diff --git a/include/private/SkTDArray.h b/include/private/SkTDArray.h index acf69b58b4..4c58d478fe 100644 --- a/include/private/SkTDArray.h +++ b/include/private/SkTDArray.h @@ -11,7 +11,7 @@ #define SkTDArray_DEFINED #include "SkTypes.h" -#include "SkMemory.h" +#include "SkMalloc.h" template <typename T> class SkTDArray { public: diff --git a/include/private/SkTemplates.h b/include/private/SkTemplates.h index e8dd04e6c5..351fcccfc3 100644 --- a/include/private/SkTemplates.h +++ b/include/private/SkTemplates.h @@ -11,7 +11,7 @@ #define SkTemplates_DEFINED #include "SkMath.h" -#include "SkMemory.h" +#include "SkMalloc.h" #include "SkTLogic.h" #include "SkTypes.h" #include <limits.h> |