From 6787c4c3dd11d4d8db8255e59a1d71b6ab03cebb Mon Sep 17 00:00:00 2001
From: Kim Barrett <kbarrett@openjdk.org>
Date: Fri, 2 Feb 2024 16:19:08 +0000
Subject: [PATCH] 8325055: Rename Injector.h

Reviewed-by: dholmes, amenkov, sspitsyn
---
 .../hotspot/jtreg/vmTestbase/nsk/share/jvmti/Injector.cpp | 2 +-
 .../nsk/share/jvmti/{Injector.h => Injector.hpp}          | 8 ++++----
 test/hotspot/jtreg/vmTestbase/nsk/share/jvmti/README      | 8 ++++----
 .../jtreg/vmTestbase/nsk/share/jvmti/hotswap/HotSwap.cpp  | 2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)
 rename test/hotspot/jtreg/vmTestbase/nsk/share/jvmti/{Injector.h => Injector.hpp} (98%)

diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/jvmti/Injector.cpp b/test/hotspot/jtreg/vmTestbase/nsk/share/jvmti/Injector.cpp
index b69faf76ffa..cbf680175e7 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/share/jvmti/Injector.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/share/jvmti/Injector.cpp
@@ -25,7 +25,7 @@
 #include <string.h>
 #include "jni_tools.h"
 #include "jvmti_tools.h"
-#include "Injector.h"
+#include "Injector.hpp"
 
 /* ========================================================================== */
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/jvmti/Injector.h b/test/hotspot/jtreg/vmTestbase/nsk/share/jvmti/Injector.hpp
similarity index 98%
rename from test/hotspot/jtreg/vmTestbase/nsk/share/jvmti/Injector.h
rename to test/hotspot/jtreg/vmTestbase/nsk/share/jvmti/Injector.hpp
index 3dad0b88f7e..491f203259c 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/share/jvmti/Injector.h
+++ b/test/hotspot/jtreg/vmTestbase/nsk/share/jvmti/Injector.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 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
@@ -21,8 +21,8 @@
  * questions.
  */
 
-#ifndef _NSK_SHARE_JVMTI_INJECTOR_H_
-#define _NSK_SHARE_JVMTI_INJECTOR_H_
+#ifndef _NSK_SHARE_JVMTI_INJECTOR_HPP_
+#define _NSK_SHARE_JVMTI_INJECTOR_HPP_
 
 /* Class File Format Constants
  */
@@ -304,4 +304,4 @@ int Inject(const u1* old_bytes, const jint old_length,
 
 }
 
-#endif /* _NSK_SHARE_JVMTI_INJECTOR_H_ */
+#endif /* _NSK_SHARE_JVMTI_INJECTOR_HPP_ */
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/jvmti/README b/test/hotspot/jtreg/vmTestbase/nsk/share/jvmti/README
index 9be9bb969cd..52e7ca3d31c 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/share/jvmti/README
+++ b/test/hotspot/jtreg/vmTestbase/nsk/share/jvmti/README
@@ -1,4 +1,4 @@
-Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2003, 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
@@ -28,8 +28,8 @@ which provides support for JVMTI tests and accessing JVMTI environment.
         jvmti_tools.h
         jvmti_tools.c
         agent_tools.c
-        Injector.h
-        Injector.c
+        Injector.hpp
+        Injector.cpp
         JVMTITools.h
         JVMTITools.c
 
@@ -150,7 +150,7 @@ a null-terminated character string:
 
 ---------------------------------------------------------------------------------
 
-Injector.h
+Injector.hpp
 
 Provides class file format constants and the function which inject some
 profiling bytecodes into Java class files:
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/jvmti/hotswap/HotSwap.cpp b/test/hotspot/jtreg/vmTestbase/nsk/share/jvmti/hotswap/HotSwap.cpp
index 5976eb39ec7..c444f304738 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/share/jvmti/hotswap/HotSwap.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/share/jvmti/hotswap/HotSwap.cpp
@@ -26,7 +26,7 @@
 #include <atomic>
 #include "jni_tools.h"
 #include "jvmti_tools.h"
-#include "Injector.h"
+#include "Injector.hpp"
 #include "agent_common.h"
 
 #define PASSED 0