Skip to content

Commit 2852f08

Browse files
committed
8325682: Rename nsk_strace.h
Backport-of: 22e81810ddb293ceb45d577b2b0ab43ab3f154b2
1 parent 82c30fe commit 2852f08

File tree

11 files changed

+26
-26
lines changed

11 files changed

+26
-26
lines changed

test/hotspot/jtreg/vmTestbase/nsk/stress/strace/nsk_strace.h renamed to test/hotspot/jtreg/vmTestbase/nsk/stress/strace/nsk_strace.hpp

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2003, 2018, 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
@@ -35,7 +35,7 @@
3535
// Check for pending exception of the specified type
3636
// If it's present, then clear it
3737
#define EXCEPTION_CHECK(exceptionClass, recurDepth) \
38-
if (EXCEPTION_OCCURRED != NULL) { \
38+
if (EXCEPTION_OCCURRED != nullptr) { \
3939
jobject exception = EXCEPTION_OCCURRED; \
4040
if (env->IsInstanceOf(exception, exceptionClass) == JNI_TRUE) { \
4141
EXCEPTION_CLEAR; \
@@ -45,22 +45,22 @@
4545

4646
#define FIND_CLASS(_class, _className)\
4747
if (!NSK_JNI_VERIFY(env, (_class = \
48-
env->FindClass(_className)) != NULL))\
48+
env->FindClass(_className)) != nullptr))\
4949
exit(1)
5050

5151
#define GET_OBJECT_CLASS(_class, _obj)\
5252
if (!NSK_JNI_VERIFY(env, (_class = \
53-
env->GetObjectClass(_obj)) != NULL))\
53+
env->GetObjectClass(_obj)) != nullptr))\
5454
exit(1)
5555

5656
#define GET_FIELD_ID(_fieldID, _class, _fieldName, _fieldSig)\
5757
if (!NSK_JNI_VERIFY(env, (_fieldID = \
58-
env->GetFieldID(_class, _fieldName, _fieldSig)) != NULL))\
58+
env->GetFieldID(_class, _fieldName, _fieldSig)) != nullptr))\
5959
exit(1)
6060

6161
#define GET_STATIC_FIELD_ID(_fieldID, _class, _fieldName, _fieldSig)\
6262
if (!NSK_JNI_VERIFY(env, (_fieldID = \
63-
env->GetStaticFieldID(_class, _fieldName, _fieldSig)) != NULL))\
63+
env->GetStaticFieldID(_class, _fieldName, _fieldSig)) != nullptr))\
6464
exit(1)
6565

6666
#define GET_STATIC_BOOL_FIELD(_value, _class, _fieldName)\
@@ -93,12 +93,12 @@
9393

9494
#define GET_STATIC_METHOD_ID(_methodID, _class, _methodName, _sig)\
9595
if (!NSK_JNI_VERIFY(env, (_methodID = \
96-
env->GetStaticMethodID(_class, _methodName, _sig)) != NULL))\
96+
env->GetStaticMethodID(_class, _methodName, _sig)) != nullptr))\
9797
exit(1)
9898

9999
#define GET_METHOD_ID(_methodID, _class, _methodName, _sig)\
100100
if (!NSK_JNI_VERIFY(env, (_methodID = \
101-
env->GetMethodID(_class, _methodName, _sig)) != NULL))\
101+
env->GetMethodID(_class, _methodName, _sig)) != nullptr))\
102102
exit(1)
103103

104104
#define CALL_STATIC_VOID_NOPARAM(_class, _methodName)\

test/hotspot/jtreg/vmTestbase/nsk/stress/strace/strace003.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2003, 2018, 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
@@ -22,7 +22,7 @@
2222
*/
2323

2424
#include <stdio.h>
25-
#include "nsk_strace.h"
25+
#include "nsk_strace.hpp"
2626

2727
extern "C" {
2828

test/hotspot/jtreg/vmTestbase/nsk/stress/strace/strace004.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2003, 2018, 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
@@ -22,7 +22,7 @@
2222
*/
2323

2424
#include <stdio.h>
25-
#include "nsk_strace.h"
25+
#include "nsk_strace.hpp"
2626

2727
extern "C" {
2828

test/hotspot/jtreg/vmTestbase/nsk/stress/strace/strace005.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
*/
2323

2424
#include <stdio.h>
25-
#include "nsk_strace.h"
25+
#include "nsk_strace.hpp"
2626
#include "nsk_tools.h"
2727

2828
extern "C" {

test/hotspot/jtreg/vmTestbase/nsk/stress/strace/strace006.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
*/
2323

2424
#include <stdio.h>
25-
#include "nsk_strace.h"
25+
#include "nsk_strace.hpp"
2626

2727
extern "C" {
2828

test/hotspot/jtreg/vmTestbase/nsk/stress/strace/strace008.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2003, 2018, 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
@@ -22,7 +22,7 @@
2222
*/
2323

2424
#include <stdio.h>
25-
#include "nsk_strace.h"
25+
#include "nsk_strace.hpp"
2626

2727
extern "C" {
2828

test/hotspot/jtreg/vmTestbase/nsk/stress/strace/strace009.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2003, 2018, 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
@@ -22,7 +22,7 @@
2222
*/
2323

2424
#include <stdio.h>
25-
#include "nsk_strace.h"
25+
#include "nsk_strace.hpp"
2626

2727
extern "C" {
2828

test/hotspot/jtreg/vmTestbase/nsk/stress/strace/strace011.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2003, 2018, 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
@@ -22,7 +22,7 @@
2222
*/
2323

2424
#include <stdio.h>
25-
#include "nsk_strace.h"
25+
#include "nsk_strace.hpp"
2626

2727
extern "C" {
2828

test/hotspot/jtreg/vmTestbase/nsk/stress/strace/strace012.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2003, 2018, 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
@@ -22,7 +22,7 @@
2222
*/
2323

2424
#include <stdio.h>
25-
#include "nsk_strace.h"
25+
#include "nsk_strace.hpp"
2626

2727
extern "C" {
2828

test/hotspot/jtreg/vmTestbase/nsk/stress/strace/strace014.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2003, 2018, 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
@@ -22,7 +22,7 @@
2222
*/
2323

2424
#include <stdio.h>
25-
#include "nsk_strace.h"
25+
#include "nsk_strace.hpp"
2626

2727
extern "C" {
2828

0 commit comments

Comments
 (0)