From db5f7bf0a439b744facda6b6b1590b4554d64fd8 Mon Sep 17 00:00:00 2001 From: "ehsan.akhgari" Date: Wed, 9 Jul 2014 11:13:55 -0700 Subject: [PATCH] Do not export SkTDArray when building Skia as a DLL This class has four members (deleteAll, freeAll, unrefAll and safeUnrefAll) which will only compile for certain instantiations of SkTDArray depending on the template argument type. Marking this class as dllexport breaks the build with clang-cl because of http://llvm.org/PR20163. Since this class is header-only, we can just make it non-exported to enable building Skia as a DLL with clang-cl. BUG=skia: R=ctguil@chromium.org, mtklein@google.com, reed@google.com Author: ehsan.akhgari@gmail.com Review URL: https://codereview.chromium.org/368253002 --- AUTHORS | 1 + include/core/SkTDArray.h | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/AUTHORS b/AUTHORS index 96f53cefe..496cbc745 100644 --- a/AUTHORS +++ b/AUTHORS @@ -13,6 +13,7 @@ ACCESS CO., LTD. <*@access-company.com> ARM <*@arm.com> +Ehsan Akhgari George Wright Google Inc. <*@google.com> Igalia <*@igalia.com> diff --git a/include/core/SkTDArray.h b/include/core/SkTDArray.h index ecbfbd90e..4c90460b9 100644 --- a/include/core/SkTDArray.h +++ b/include/core/SkTDArray.h @@ -12,7 +12,7 @@ #include "SkTypes.h" -template class SK_API SkTDArray { +template class SkTDArray { public: SkTDArray() { fReserve = fCount = 0;