Skip to content

Commit 361f539

Browse files
author
duke
committed
Backport f57c7223cf9b732db5255b3e394ee07ff741f074
1 parent cd0df72 commit 361f539

File tree

9 files changed

+15
-15
lines changed

9 files changed

+15
-15
lines changed

test/hotspot/jtreg/serviceability/jvmti/thread/GetStackTrace/GetStackTraceAndRetransformTest/libGetStackTraceAndRetransformTest.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
#include <string.h>
2626
#include "jvmti.h"
2727
#include "jvmti_common.h"
28-
#include "../get_stack_trace.h"
28+
#include "../get_stack_trace.hpp"
2929

3030

3131
extern "C" {

test/hotspot/jtreg/serviceability/jvmti/thread/GetStackTrace/GetStackTraceCurrentThreadTest/libGetStackTraceCurrentThreadTest.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
#include <string.h>
2626
#include "jvmti.h"
2727
#include "jvmti_common.h"
28-
#include "../get_stack_trace.h"
28+
#include "../get_stack_trace.hpp"
2929

3030

3131
extern "C" {

test/hotspot/jtreg/serviceability/jvmti/thread/GetStackTrace/get_stack_trace.h renamed to test/hotspot/jtreg/serviceability/jvmti/thread/GetStackTrace/get_stack_trace.hpp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -21,8 +21,8 @@
2121
* questions.
2222
*/
2323

24-
#ifndef GET_STACK_TRACE_H
25-
#define GET_STACK_TRACE_H
24+
#ifndef GET_STACK_TRACE_HPP
25+
#define GET_STACK_TRACE_HPP
2626
#include "jvmti.h"
2727

2828
typedef struct {
@@ -81,18 +81,18 @@ int compare_stack_trace(jvmtiEnv *jvmti, JNIEnv *jni, jthread thread,
8181
lambda_idx = lambda - expected_frames[exp_idx].cls;
8282
printf("Comparing only first %zu chars in classname.\n", lambda_idx);
8383
}
84-
if (class_signature == NULL || strncmp(class_signature, expected_frames[exp_idx].cls, lambda_idx) != 0) {
84+
if (class_signature == nullptr || strncmp(class_signature, expected_frames[exp_idx].cls, lambda_idx) != 0) {
8585
printf("(frame#%d) wrong class sig: \"%s\", expected: \"%s\"\n",
8686
exp_idx, class_signature, expected_frames[exp_idx].cls);
8787
result = JNI_FALSE;
8888
}
8989

90-
if (name == NULL || strcmp(name, expected_frames[exp_idx].name) != 0) {
90+
if (name == nullptr || strcmp(name, expected_frames[exp_idx].name) != 0) {
9191
printf("(frame#%d) wrong method name: \"%s\", expected: \"%s\"\n",
9292
exp_idx, name, expected_frames[exp_idx].name);
9393
result = JNI_FALSE;
9494
}
95-
if (sig == NULL || strcmp(sig, expected_frames[exp_idx].sig) != 0) {
95+
if (sig == nullptr || strcmp(sig, expected_frames[exp_idx].sig) != 0) {
9696
printf("(frame#%d) wrong method sig: \"%s\", expected: \"%s\"\n",
9797
exp_idx, sig, expected_frames[exp_idx].sig);
9898
result = JNI_FALSE;
@@ -103,4 +103,4 @@ int compare_stack_trace(jvmtiEnv *jvmti, JNIEnv *jni, jthread thread,
103103
}
104104

105105

106-
#endif //GET_STACK_TRACE_H
106+
#endif //GET_STACK_TRACE_HPP

test/hotspot/jtreg/serviceability/jvmti/thread/GetStackTrace/getstacktr03/libgetstacktr03.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
#include <string.h>
2626
#include "jvmti.h"
2727
#include "jvmti_common.h"
28-
#include "../get_stack_trace.h"
28+
#include "../get_stack_trace.hpp"
2929

3030
extern "C" {
3131

test/hotspot/jtreg/serviceability/jvmti/thread/GetStackTrace/getstacktr04/libgetstacktr04.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
#include <string.h>
2626
#include "jvmti.h"
2727
#include "jvmti_common.h"
28-
#include "../get_stack_trace.h"
28+
#include "../get_stack_trace.hpp"
2929

3030
extern "C" {
3131

test/hotspot/jtreg/serviceability/jvmti/thread/GetStackTrace/getstacktr05/libgetstacktr05.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
#include <string.h>
2626
#include "jvmti.h"
2727
#include "jvmti_common.h"
28-
#include "../get_stack_trace.h"
28+
#include "../get_stack_trace.hpp"
2929

3030
extern "C" {
3131

test/hotspot/jtreg/serviceability/jvmti/thread/GetStackTrace/getstacktr06/libgetstacktr06.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
#include <string.h>
2626
#include "jvmti.h"
2727
#include "jvmti_common.h"
28-
#include "../get_stack_trace.h"
28+
#include "../get_stack_trace.hpp"
2929

3030

3131
extern "C" {

test/hotspot/jtreg/serviceability/jvmti/thread/GetStackTrace/getstacktr07/libgetstacktr07.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
#include <string.h>
2626
#include "jvmti.h"
2727
#include "jvmti_common.h"
28-
#include "../get_stack_trace.h"
28+
#include "../get_stack_trace.hpp"
2929

3030
extern "C" {
3131

test/hotspot/jtreg/serviceability/jvmti/thread/GetStackTrace/getstacktr08/libgetstacktr08.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
#include <string.h>
2626
#include "jvmti.h"
2727
#include "jvmti_common.h"
28-
#include "../get_stack_trace.h"
28+
#include "../get_stack_trace.hpp"
2929

3030
extern "C" {
3131

0 commit comments

Comments
 (0)