From 2d252ee06e8d620c3048e4556079b402f4472a32 Mon Sep 17 00:00:00 2001
From: Kim Barrett <kbarrett@openjdk.org>
Date: Tue, 6 Feb 2024 17:15:36 +0000
Subject: [PATCH] 8325180: Rename jvmti_FollowRefObjects.h

Reviewed-by: sspitsyn, jwaters, lmesnik
---
 .../unit/FollowReferences/followref004/followref004.cpp   | 2 +-
 .../unit/FollowReferences/followref005/followref005.cpp   | 2 +-
 .../unit/FollowReferences/followref006/followref006.cpp   | 2 +-
 .../vmTestbase/nsk/share/jvmti/jvmti_FollowRefObjects.cpp | 2 +-
 ...vmti_FollowRefObjects.h => jvmti_FollowRefObjects.hpp} | 8 ++++----
 5 files changed, 8 insertions(+), 8 deletions(-)
 rename test/hotspot/jtreg/vmTestbase/nsk/share/jvmti/{jvmti_FollowRefObjects.h => jvmti_FollowRefObjects.hpp} (94%)

diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/FollowReferences/followref004/followref004.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/FollowReferences/followref004/followref004.cpp
index c6c24999441..fb1a080f766 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/FollowReferences/followref004/followref004.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/FollowReferences/followref004/followref004.cpp
@@ -26,7 +26,7 @@
 #include "agent_common.h"
 #include "jni_tools.h"
 #include "jvmti_tools.h"
-#include "jvmti_FollowRefObjects.h"
+#include "jvmti_FollowRefObjects.hpp"
 
 extern "C" {
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/FollowReferences/followref005/followref005.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/FollowReferences/followref005/followref005.cpp
index a8df86c3273..2ba2c653820 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/FollowReferences/followref005/followref005.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/FollowReferences/followref005/followref005.cpp
@@ -25,7 +25,7 @@
 #include "agent_common.h"
 #include "jni_tools.h"
 #include "jvmti_tools.h"
-#include "jvmti_FollowRefObjects.h"
+#include "jvmti_FollowRefObjects.hpp"
 
 extern "C" {
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/FollowReferences/followref006/followref006.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/FollowReferences/followref006/followref006.cpp
index d161739de62..40829005f2e 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/FollowReferences/followref006/followref006.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/FollowReferences/followref006/followref006.cpp
@@ -26,7 +26,7 @@
 #include "agent_common.h"
 #include "jni_tools.h"
 #include "jvmti_tools.h"
-#include "jvmti_FollowRefObjects.h"
+#include "jvmti_FollowRefObjects.hpp"
 
 extern "C" {
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/jvmti/jvmti_FollowRefObjects.cpp b/test/hotspot/jtreg/vmTestbase/nsk/share/jvmti/jvmti_FollowRefObjects.cpp
index bf48fd1da73..d9e5c494474 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/share/jvmti/jvmti_FollowRefObjects.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/share/jvmti/jvmti_FollowRefObjects.cpp
@@ -25,7 +25,7 @@
 #include <jvmti.h>
 #include "jni_tools.h"
 #include "jvmti_tools.h"
-#include "jvmti_FollowRefObjects.h"
+#include "jvmti_FollowRefObjects.hpp"
 
 extern "C" {
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/jvmti/jvmti_FollowRefObjects.h b/test/hotspot/jtreg/vmTestbase/nsk/share/jvmti/jvmti_FollowRefObjects.hpp
similarity index 94%
rename from test/hotspot/jtreg/vmTestbase/nsk/share/jvmti/jvmti_FollowRefObjects.h
rename to test/hotspot/jtreg/vmTestbase/nsk/share/jvmti/jvmti_FollowRefObjects.hpp
index 2c0bb8e2a6b..abae1af63d8 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/share/jvmti/jvmti_FollowRefObjects.h
+++ b/test/hotspot/jtreg/vmTestbase/nsk/share/jvmti/jvmti_FollowRefObjects.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2024, 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
@@ -20,8 +20,8 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-#ifndef __FollowRefObject_h
-#define __FollowRefObject_h
+#ifndef __FollowRefObject_hpp
+#define __FollowRefObject_hpp
 
 #include <jvmti.h>
 
@@ -34,7 +34,7 @@ void jvmti_FollowRefObject_init();
 /* ============================================================================= */
 
 #define DBG(x) x
-#define DEREF(ptr) (((ptr) == NULL ? 0 : *(ptr)))
+#define DEREF(ptr) (((ptr) == nullptr ? 0 : *(ptr)))
 
 extern jvmtiHeapCallbacks g_wrongHeapCallbacks; /* Callbacks that blame */