From faab46edc3a712aae70c8120779e7953804bde35 Mon Sep 17 00:00:00 2001 From: David Major Date: Wed, 12 Aug 2015 15:31:33 -0400 Subject: [PATCH] Bug 1193459 review follow-up: Copy the comment from TraceKind.h. DONTBUILD CLOSED TREE --HG-- extra : amend_source : 8dfc5ad94bd1784c6be9ac8ae863eedfcbe04e83 --- js/src/vm/UnboxedObject-inl.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/js/src/vm/UnboxedObject-inl.h b/js/src/vm/UnboxedObject-inl.h index 73733198debf..8e021a3e9c00 100644 --- a/js/src/vm/UnboxedObject-inl.h +++ b/js/src/vm/UnboxedObject-inl.h @@ -584,7 +584,8 @@ CopyBoxedOrUnboxedDenseElements(JSContext* cx, JSObject* dst, JSObject* src, ///////////////////////////////////////////////////////////////////// // Goop to fix MSVC. See DispatchTraceKindTyped in TraceKind.h. -#if defined(_MSC_VER) && !defined(__clang__) +// The clang-cl front end defines _MSC_VER, but still requires the explicit +// template declaration, so we must test for __clang__ here as well. # define DEPENDENT_TEMPLATE_HINT #else # define DEPENDENT_TEMPLATE_HINT template