diff options
author | Ben Wagner <bungeman@google.com> | 2017-03-09 15:12:09 -0500 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-03-09 21:57:18 +0000 |
commit | f1b61afbe97199896bfbcadb68758bfcf0dc803a (patch) | |
tree | 4a3199a285f17c74d2999ca2300215fd897a2c07 /src/ports/SkFontHost_FreeType.cpp | |
parent | db3ceb86421fb9da86bb920e3a1f0957beec08d9 (diff) |
Mark function used as template parameter extern.
VC++19.10.2517 does not support the C++11 change to allow the address of
internal linkage objects to be used as non-type template arguments.
BUG=skia:6351
Change-Id: I7e1f628db794f950dfba7d043cf6d2fbf0a8c453
Reviewed-on: https://skia-review.googlesource.com/9496
Reviewed-by: Ben Wagner <bungeman@google.com>
Commit-Queue: Ben Wagner <bungeman@google.com>
Diffstat (limited to 'src/ports/SkFontHost_FreeType.cpp')
-rw-r--r-- | src/ports/SkFontHost_FreeType.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/ports/SkFontHost_FreeType.cpp b/src/ports/SkFontHost_FreeType.cpp index eee76d5730..d155308074 100644 --- a/src/ports/SkFontHost_FreeType.cpp +++ b/src/ports/SkFontHost_FreeType.cpp @@ -388,7 +388,8 @@ static SkFaceRec* ref_ft_face(const SkTypeface* typeface) { } // Caller must lock gFTMutex before calling this function. -static void unref_ft_face(SkFaceRec* faceRec) { +// Marked extern because vc++ does not support internal linkage template parameters. +extern /*static*/ void unref_ft_face(SkFaceRec* faceRec) { gFTMutex.assertHeld(); SkFaceRec* rec = gFaceRecHead; |