diff options
| author |  bungeman <bungeman@google.com> | 2015-08-19 11:56:48 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-08-19 11:56:48 -0700 |
| commit | f3c15b7cfc4eed2528f7db87ea6c1444b55ee856 (patch) | |
| tree | 00516f1f5ecd2b72ef8d8cd6643055a5d9db8f2c /include/utils | |
| parent | 9be0b002caaf4f44e04873351f957c3e97922457 (diff) | |
Move SkTemplates.h to private.
SkTemplates.h contains a number of Skia specific utilities which are
not designed for external use. In addition to reducing the external
support burden, this will allow Skia to freely refactor this file.
Review URL: https://codereview.chromium.org/1272293004
Diffstat (limited to 'include/utils')
| -rw-r--r-- | include/utils/win/SkAutoCoInitialize.h | 6 | ||||
| -rw-r--r-- | include/utils/win/SkTScopedComPtr.h | 2 |
2 files changed, 1 insertions, 7 deletions
diff --git a/include/utils/win/SkAutoCoInitialize.h b/include/utils/win/SkAutoCoInitialize.h index f671e68205..1123002b61 100644 --- a/include/utils/win/SkAutoCoInitialize.h +++ b/include/utils/win/SkAutoCoInitialize.h @@ -1,4 +1,3 @@ - /* * Copyright 2011 Google Inc. * @@ -6,13 +5,10 @@ * found in the LICENSE file. */ - #ifndef SkAutoCo_DEFINED #define SkAutoCo_DEFINED -#define WIN32_LEAN_AND_MEAN -#include <windows.h> -#include "SkTemplates.h" +#include "SkTypes.h" /** * An instance of this class initializes COM on creation diff --git a/include/utils/win/SkTScopedComPtr.h b/include/utils/win/SkTScopedComPtr.h index 38d104878b..b906fb7c18 100644 --- a/include/utils/win/SkTScopedComPtr.h +++ b/include/utils/win/SkTScopedComPtr.h @@ -1,4 +1,3 @@ - /* * Copyright 2011 Google Inc. * @@ -10,7 +9,6 @@ #define SkTScopedComPtr_DEFINED #include "SkTypes.h" -#include "SkTemplates.h" template<typename T> class SkBlockComRef : public T { |