From 48a2c42b58f5b362d0cae156ada5eb9f38870979 Mon Sep 17 00:00:00 2001
From: Makoto Kato <m_kato@ga2.so-net.ne.jp>
Date: Mon, 21 Nov 2016 11:14:44 +0900
Subject: [PATCH] Bug 1310067 - VS2017 doesn't require
 JS_DEPENDENT_TEMPLATE_HINT workaround. r=jonco

MozReview-Commit-ID: DuDDyP6tpc8
---
 js/public/TraceKind.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/js/public/TraceKind.h b/js/public/TraceKind.h
index 2eda9cb2c154..5ef40cbc1788 100644
--- a/js/public/TraceKind.h
+++ b/js/public/TraceKind.h
@@ -164,12 +164,12 @@ template <> struct MapTypeToRootKind<JSFunction*> : public MapTypeToRootKind<JSO
 // type designated by |traceKind| as the functor's template argument. The
 // |thing| parameter is optional; without it, we simply pass through |... args|.
 
-// GCC and Clang require an explicit template declaration in front of the
-// specialization of operator() because it is a dependent template. MSVC, on
-// the other hand, gets very confused if we have a |template| token there.
+// VS2017+, GCC and Clang require an explicit template declaration in front of
+// the specialization of operator() because it is a dependent template. VS2015,
+// on the other hand, gets very confused if we have a |template| token there.
 // The clang-cl front end defines _MSC_VER, but still requires the explicit
 // template declaration, so we must test for __clang__ here as well.
-#if defined(_MSC_VER) && !defined(__clang__)
+#if (defined(_MSC_VER) && _MSC_VER < 1910) && !defined(__clang__)
 # define JS_DEPENDENT_TEMPLATE_HINT
 #else
 # define JS_DEPENDENT_TEMPLATE_HINT template