AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Mark function used as template parameter extern.

Browse Source 
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>
This commit is contained in:
Ben Wagner 2017-03-09 15:12:09 -05:00 committed by Skia Commit-Bot
parent db3ceb8642
commit f1b61afbe9
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/ports/SkFontHost_FreeType.cpp
View File

@ -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;