stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8202051: Address compilation warnings in libawt with VS2017

Browse Source 
Reviewed-by: prr
This commit is contained in:
Sergey Bylokhov 2018-05-31 09:24:27 -07:00
parent 92c17de5cf
commit 414dd381fc
4 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
make/lib/Awt2dLibraries.gmk
View File

@ -224,7 +224,7 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBAWT, \
format-nonliteral parentheses, \ format-nonliteral parentheses, \
DISABLED_WARNINGS_clang := logical-op-parentheses extern-initializer, \ DISABLED_WARNINGS_clang := logical-op-parentheses extern-initializer, \
DISABLED_WARNINGS_solstudio := E_DECLARATION_IN_CODE, \ DISABLED_WARNINGS_solstudio := E_DECLARATION_IN_CODE, \
DISABLED_WARNINGS_microsoft := 4297 4244 4267 4291 4302 4311 4996, \ DISABLED_WARNINGS_microsoft := 4297 4244 4267 4996, \
ASFLAGS := $(LIBAWT_ASFLAGS), \ ASFLAGS := $(LIBAWT_ASFLAGS), \
LDFLAGS := $(LDFLAGS_JDKLIB) $(call SET_SHARED_LIBRARY_ORIGIN), \ LDFLAGS := $(LDFLAGS_JDKLIB) $(call SET_SHARED_LIBRARY_ORIGIN), \
LDFLAGS_macosx := -L$(INSTALL_LIBRARIES_HERE), \ LDFLAGS_macosx := -L$(INSTALL_LIBRARIES_HERE), \

9
src/java.desktop/windows/native/libawt/windows/awt_Debug.cpp
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 1999, 2018, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -56,11 +56,14 @@ void * operator new[](size_t size, const char * filename, int linenumber) {
return ptr; return ptr;
} }
#if _MSC_VER >= 1200
void operator delete(void *ptr, const char*, int) { void operator delete(void *ptr, const char*, int) {
DASSERTMSG(FALSE, "This version of 'delete' should never get called!!!"); DASSERTMSG(FALSE, "This version of 'delete' should never get called!!!");
} }
#endif
void operator delete[](void *ptr, const char*, int) {
DASSERTMSG(FALSE, "This version of 'delete' should never get called!!!");
}
void operator delete(void *ptr) throw() { void operator delete(void *ptr) throw() {
DMem_FreeBlock(ptr); DMem_FreeBlock(ptr);
} }

6
src/java.desktop/windows/native/libawt/windows/awt_Debug.h
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 1999, 2018, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -50,10 +50,8 @@
extern void * operator new(size_t size, const char * filename, int linenumber); extern void * operator new(size_t size, const char * filename, int linenumber);
extern void * operator new[](size_t size, const char * filename, int linenumber); extern void * operator new[](size_t size, const char * filename, int linenumber);
#if _MSC_VER >= 1200
/* VC 6.0 is more strict about enforcing matching placement new & delete */
extern void operator delete(void *ptr, const char*, int); extern void operator delete(void *ptr, const char*, int);
#endif extern void operator delete[](void *ptr, const char*, int);
extern void operator delete(void *ptr) throw(); extern void operator delete(void *ptr) throw();
extern void DumpClipRectangle(const char * file, int line, int argc, const char * fmt, va_list arglist); extern void DumpClipRectangle(const char * file, int line, int argc, const char * fmt, va_list arglist);

10
src/java.desktop/windows/native/libawt/windows/awt_Toolkit.cpp
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 1996, 2017, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 1996, 2018, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -3137,11 +3137,11 @@ bool AwtToolkit::IsTouchKeyboardAutoShowSystemEnabled() {
void AwtToolkit::ShowTouchKeyboard() { void AwtToolkit::ShowTouchKeyboard() {
if (m_isWin8OrLater && m_touchKbrdAutoShowIsEnabled && if (m_isWin8OrLater && m_touchKbrdAutoShowIsEnabled &&
(m_touchKbrdExeFilePath != NULL)) { (m_touchKbrdExeFilePath != NULL)) {
HINSTANCE retVal = ::ShellExecute(NULL, _T("open"), int retVal = (int)((intptr_t)::ShellExecute(NULL, _T("open"),
m_touchKbrdExeFilePath, NULL, NULL, SW_SHOW); m_touchKbrdExeFilePath, NULL, NULL, SW_SHOW));
if ((int)((intptr_t)retVal) <= 32) { if (retVal <= 32) {
DTRACE_PRINTLN1("AwtToolkit::ShowTouchKeyboard: Failed" DTRACE_PRINTLN1("AwtToolkit::ShowTouchKeyboard: Failed"
", retVal='%d'", (int)retVal); ", retVal='%d'", retVal);
} }
} }
} }