changeset 9750:b0043a4c9d95 jdk-9+117

8155692: changes to compile under Visual Studio 14.0 Reviewed-by: kcr, ddhill
author flar <James.Graham@oracle.com>
date Fri, 29 Apr 2016 16:46:36 -0700
parents 2b562a2d0fca
children 7bd3f3c23146 033f74d813c7
files buildSrc/genVSproperties.bat modules/graphics/src/main/native-glass/win/GlassClipboard.cpp modules/graphics/src/main/native-glass/win/common.h
diffstat 3 files changed, 11 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/buildSrc/genVSproperties.bat	Fri Apr 29 13:53:40 2016 -0700
+++ b/buildSrc/genVSproperties.bat	Fri Apr 29 16:46:36 2016 -0700
@@ -31,8 +31,15 @@
 set LIBPATH=
 
 REM Run the vsvars32.bat file, sending it's output to neverland.
+REM The current officially supported Visual Studio version is 12.0.
+REM Handling of 14.0 is included here, but not yet supported.
+REM The previous officially supported VS version was 10.0
+REM Handling of 11.0 has been included, but not really tested.
+REM So, the search order is 120, then 140, then 100, then 110
 set VSVER=120
 set VSVARSDIR=%VS120COMNTOOLS%
+if "%VSVARSDIR%"=="" set VSVER=140
+if "%VSVARSDIR%"=="" set VSVARSDIR=%VS140COMNTOOLS%
 if "%VSVARSDIR%"=="" set VSVER=100
 if "%VSVARSDIR%"=="" set VSVARSDIR=%VS100COMNTOOLS%
 if "%VSVARSDIR%"=="" set VSVER=110
--- a/modules/graphics/src/main/native-glass/win/GlassClipboard.cpp	Fri Apr 29 13:53:40 2016 -0700
+++ b/modules/graphics/src/main/native-glass/win/GlassClipboard.cpp	Fri Apr 29 16:46:36 2016 -0700
@@ -25,6 +25,10 @@
 
 #include "common.h"
 
+#define  _SILENCE_STDEXT_HASH_DEPRECATION_WARNINGS
+#include <hash_map>
+#include <hash_set>
+
 #include "GlassApplication.h"
 #include "GlassClipboard.h"
 #include "GlassDnD.h"
--- a/modules/graphics/src/main/native-glass/win/common.h	Fri Apr 29 13:53:40 2016 -0700
+++ b/modules/graphics/src/main/native-glass/win/common.h	Fri Apr 29 16:46:36 2016 -0700
@@ -42,8 +42,6 @@
 #include <assert.h>
 #include <comdef.h>
 #include <comutil.h>
-#include <hash_map>
-#include <hash_set>
 #include <imm.h>
 #include <jni.h>
 #include <malloc.h>