Skip to content
Permalink
Browse files

Automatic merge of jdk:master into master

  • Loading branch information
duke
duke committed Jun 30, 2020
2 parents 7ab4586 + a338213 commit bdb2025af823120304d53e57bffd82a1078a83e4
Showing with 0 additions and 5 deletions.
  1. +0 −5 src/hotspot/share/utilities/globalDefinitions_visCPP.hpp
@@ -119,11 +119,6 @@ inline int g_isfinite(jdouble f) { return _finite(f); }
#define unlink _unlink
#define strdup _strdup

#ifdef CHECK_UNHANDLED_OOPS
#pragma warning( disable : 4521 ) // class has multiple copy ctors of a single type
#pragma warning( disable : 4522 ) // class has multiple assignment operators of a single type
#endif // CHECK_UNHANDLED_OOPS

// Formatting.
#define FORMAT64_MODIFIER "I64"

0 comments on commit bdb2025

Please sign in to comment.
You can’t perform that action at this time.