Merge

openjdk · Jan 18, 2023 · da57ed1 · da57ed1 · openjdk-notifier · Jan 18, 2023
2 parents ddb9a5c + 36321be
commit da57ed1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/hotspot/src/share/vm/jfr/writers/jfrWriterHost.inline.hpp b/hotspot/src/share/vm/jfr/writers/jfrWriterHost.inline.hpp
@@ -70,7 +70,7 @@ template <typename T>
 inline void WriterHost<BE, IE, WriterPolicyImpl>::write(const T* value, size_t len) {
   assert(value != NULL, "invariant");
   assert(len > 0, "invariant");
-  assert(len <= max_jint, "invariant");
+  assert(len <= static_cast<size_t>(max_jint), "invariant");
   // Might need T + 1 size
   u1* const pos = ensure_size(sizeof(T) * len + len);
   if (pos) {
@@ -126,7 +126,7 @@ template <typename T>
 inline void WriterHost<BE, IE, WriterPolicyImpl>::be_write(const T* value, size_t len) {
   assert(value != NULL, "invariant");
   assert(len > 0, "invariant");
-  assert(len <= max_jint, "invariant");
+  assert(len <= static_cast<size_t>(max_jint), "invariant");
   // Big endian writes map one-to-one for length, so no extra space is needed.
   u1* const pos = ensure_size(sizeof(T) * len);
   if (pos) {

diff --git a/jdk/src/windows/native/sun/font/lcdglyph.c b/jdk/src/windows/native/sun/font/lcdglyph.c
@@ -48,8 +48,8 @@
 #include <stdio.h>
 #include <malloc.h>
 #include <math.h>
-#include <strsafe.h>
 #include <windows.h>
+#include <strsafe.h>
 #include <winuser.h>
 
 #include <jni.h>