# HG changeset patch
# User lfoltan
# Date 1519129222 18000
# Node ID 953b3fd36b08778ed1cb46aaf50afcb9e4075f2f
# Parent  6b8fb182bb17e255d5c795e4c0330a0772c9d8c3
8196997: VS2017 The non-Standard std::tr1 namespace and TR1-only machinery are deprecated and will be removed
Summary: Ignore deprecation warning for non-Standard std::tr1 namespace and TR1-only machinery when compiling gtest.
Reviewed-by: kbarrett, stuefe

diff -r 6b8fb182bb17 -r 953b3fd36b08 make/common/MakeBase.gmk
--- a/make/common/MakeBase.gmk	Tue Feb 20 07:10:42 2018 -0500
+++ b/make/common/MakeBase.gmk	Tue Feb 20 07:20:22 2018 -0500
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -423,7 +423,7 @@
 
 ################################################################################
 
-MAX_PARAMS := 35
+MAX_PARAMS := 36
 PARAM_SEQUENCE := $(call sequence, 2, $(MAX_PARAMS))
 
 # Template for creating a macro taking named parameters. To use it, assign the
diff -r 6b8fb182bb17 -r 953b3fd36b08 make/hotspot/lib/CompileGtest.gmk
--- a/make/hotspot/lib/CompileGtest.gmk	Tue Feb 20 07:10:42 2018 -0500
+++ b/make/hotspot/lib/CompileGtest.gmk	Tue Feb 20 07:20:22 2018 -0500
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -87,6 +87,7 @@
     DISABLED_WARNINGS_clang := undef switch format-nonliteral \
         tautological-undefined-compare $(BUILD_LIBJVM_DISABLED_WARNINGS_clang), \
     DISABLED_WARNINGS_solstudio := identexpected, \
+    DISABLED_WARNINGS_CXX_microsoft := 4996, \
     LDFLAGS := $(JVM_LDFLAGS), \
     LDFLAGS_solaris := -library=stlport4 $(call SET_SHARED_LIBRARY_ORIGIN), \
     LDFLAGS_aix := -bbigtoc, \