Skip to content

Commit

Permalink
8210481: Remove #ifdef cplusplus from vmTestbase
Browse files Browse the repository at this point in the history 
Remove all cplusplus ifdefs from vmTestbase

Reviewed-by: dholmes, iignatyev, cjplummer, sspitsyn
  • Loading branch information
Jean Christophe Beyler committed Sep 18, 2018
1 parent 962e755 commit 510336c
Show file tree
Hide file tree
Showing 404 changed files with 0 additions and 1,639 deletions.
4 changes: 0 additions & 4 deletions test/hotspot/jtreg/vmTestbase/gc/gctests/mallocWithGC1/libmallocWithGC1.cpp
View file
Expand Up @@ -24,9 +24,7 @@
#include <stdlib.h>
#include <time.h>

#ifdef __cplusplus
extern "C" {
#endif

JNIEXPORT void JNICALL Java_gc_gctests_mallocWithGC1_mallocWithGC1_getMallocLock01
(JNIEnv *env, jobject obj) {
Expand All @@ -43,6 +41,4 @@ JNIEXPORT void JNICALL Java_gc_gctests_mallocWithGC1_mallocWithGC1_getMallocLock
}
}

#ifdef __cplusplus
}
#endif
4 changes: 0 additions & 4 deletions test/hotspot/jtreg/vmTestbase/gc/gctests/mallocWithGC2/libmallocWithGC2.cpp
View file
Expand Up @@ -24,9 +24,7 @@
#include <stdlib.h>
#include <time.h>

#ifdef __cplusplus
extern "C" {
#endif

JNIEXPORT void JNICALL Java_gc_gctests_mallocWithGC2_mallocWithGC2_getMallocLock02
(JNIEnv *env, jobject obj) {
Expand All @@ -43,6 +41,4 @@ JNIEXPORT void JNICALL Java_gc_gctests_mallocWithGC2_mallocWithGC2_getMallocLock
}
}

#ifdef __cplusplus
}
#endif
4 changes: 0 additions & 4 deletions test/hotspot/jtreg/vmTestbase/gc/gctests/mallocWithGC3/libmallocWithGC3.cpp
View file
Expand Up @@ -24,9 +24,7 @@
#include <stdlib.h>
#include <time.h>

#ifdef __cplusplus
extern "C" {
#endif

JNIEXPORT void JNICALL
Java_gc_gctests_mallocWithGC3_mallocWithGC3_getMallocLock03
Expand All @@ -44,6 +42,4 @@ Java_gc_gctests_mallocWithGC3_mallocWithGC3_getMallocLock03
}
}

#ifdef __cplusplus
}
#endif
4 changes: 0 additions & 4 deletions test/hotspot/jtreg/vmTestbase/gc/gctests/nativeGC01/libnativeGC01.cpp
View file
Expand Up @@ -24,9 +24,7 @@
#include <jni.h>
#include <stdio.h>

#ifdef __cplusplus
extern "C" {
#endif

/*
* A C function that takes a reference to java Object( a circular Linked list)
Expand Down Expand Up @@ -66,6 +64,4 @@ Java_gc_gctests_nativeGC01_nativeGC01_nativeMethod01
return elementCount;
}

#ifdef __cplusplus
}
#endif
4 changes: 0 additions & 4 deletions test/hotspot/jtreg/vmTestbase/gc/gctests/nativeGC02/libnativeGC02.cpp
View file
Expand Up @@ -23,9 +23,7 @@
#include <jni.h>
#include <stdio.h>

#ifdef __cplusplus
extern "C" {
#endif

/* A C function that takes a reference to java Object( a circular Linked list)
and utilizes this reference to do a java method callback to determine the
Expand Down Expand Up @@ -76,6 +74,4 @@ Java_gc_gctests_nativeGC02_nativeGC02_nativeMethod02
return elementCount;
}

#ifdef __cplusplus
}
#endif
4 changes: 0 additions & 4 deletions test/hotspot/jtreg/vmTestbase/gc/gctests/nativeGC03/libnativeGC03.cpp
View file
Expand Up @@ -22,9 +22,7 @@
*/
#include <jni.h>

#ifdef __cplusplus
extern "C" {
#endif

JNIEXPORT void JNICALL
Java_gc_gctests_nativeGC03_nativeGC03_nativeMethod03
Expand Down Expand Up @@ -57,6 +55,4 @@ Java_gc_gctests_nativeGC03_nativeGC03_nativeMethod03

}

#ifdef __cplusplus
}
#endif
4 changes: 0 additions & 4 deletions test/hotspot/jtreg/vmTestbase/gc/gctests/nativeGC05/libnativeGC05.cpp
View file
Expand Up @@ -23,9 +23,7 @@
#include <jni.h>
#include <stdio.h>

#ifdef __cplusplus
extern "C" {
#endif

JNIEXPORT void JNICALL
Java_gc_gctests_nativeGC05_nativeGC05_kickOffRefillers
Expand Down Expand Up @@ -91,6 +89,4 @@ Java_gc_gctests_nativeGC05_nativeGC05_kickOffRefillers
}
}

#ifdef __cplusplus
}
#endif
4 changes: 0 additions & 4 deletions test/hotspot/jtreg/vmTestbase/nsk/aod/VirtualMachine/VirtualMachine07/agent00.cpp
View file
Expand Up @@ -26,9 +26,7 @@
#include <jni.h>
#include <aod.h>

#ifdef __cplusplus
extern "C" {
#endif

#define AGENT_NAME "VMNativeAgent00"

Expand Down Expand Up @@ -65,6 +63,4 @@ JNIEXPORT jint JNICALL Agent_OnAttach(JavaVM *vm, char *optionsString, void *res
return JNI_OK;
}

#ifdef __cplusplus
}
#endif
4 changes: 0 additions & 4 deletions test/hotspot/jtreg/vmTestbase/nsk/aod/VirtualMachine/VirtualMachine07/agent01.cpp
View file
Expand Up @@ -26,9 +26,7 @@
#include <jni.h>
#include <aod.h>

#ifdef __cplusplus
extern "C" {
#endif

#define AGENT_NAME "VMNativeAgent01"

Expand Down Expand Up @@ -68,6 +66,4 @@ JNIEXPORT jint JNICALL Agent_OnAttach(JavaVM *vm, char *optionsString, void *res
return JNI_OK;
}

#ifdef __cplusplus
}
#endif
4 changes: 0 additions & 4 deletions test/hotspot/jtreg/vmTestbase/nsk/aod/VirtualMachine/VirtualMachine07/agent02.cpp
View file
Expand Up @@ -26,9 +26,7 @@
#include <jni.h>
#include <aod.h>

#ifdef __cplusplus
extern "C" {
#endif

#define AGENT_NAME "VMNativeAgent02"

Expand Down Expand Up @@ -70,6 +68,4 @@ JNIEXPORT jint JNICALL Agent_OnAttach(JavaVM *vm, char *optionsString, void *res
return JNI_OK;
}

#ifdef __cplusplus
}
#endif
4 changes: 0 additions & 4 deletions test/hotspot/jtreg/vmTestbase/nsk/aod/VirtualMachine/VirtualMachine07/agent03.cpp
View file
Expand Up @@ -26,9 +26,7 @@
#include <jni.h>
#include <aod.h>

#ifdef __cplusplus
extern "C" {
#endif

#define AGENT_NAME "VMNativeAgent03"

Expand Down Expand Up @@ -59,6 +57,4 @@ JNIEXPORT jint JNICALL Agent_OnAttach(JavaVM *vm, char *optionsString, void *res
return ON_ATTACH_EXIT_CODE;
}

#ifdef __cplusplus
}
#endif
4 changes: 0 additions & 4 deletions test/hotspot/jtreg/vmTestbase/nsk/aod/VirtualMachine/VirtualMachine09/agent00.cpp
View file
Expand Up @@ -26,9 +26,7 @@
#include <jni.h>
#include <aod.h>

#ifdef __cplusplus
extern "C" {
#endif

/*
* Test checks following spec clause: "Agent_OnAttach function is invoked even if the agent library was loaded
Expand Down Expand Up @@ -68,6 +66,4 @@ JNIEXPORT jint JNICALL Agent_OnAttach(JavaVM *vm, char *optionsString, void *res
return JNI_OK;
}

#ifdef __cplusplus
}
#endif
4 changes: 0 additions & 4 deletions test/hotspot/jtreg/vmTestbase/nsk/jvmti/AddCapabilities/addcaps001/addcaps001.cpp
View file
Expand Up @@ -28,9 +28,7 @@
#include "jni_tools.h"
#include "jvmti_tools.h"

#ifdef __cplusplus
extern "C" {
#endif

/* ============================================================================= */

Expand Down Expand Up @@ -348,6 +346,4 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) {

/* ============================================================================= */

#ifdef __cplusplus
}
#endif
4 changes: 0 additions & 4 deletions test/hotspot/jtreg/vmTestbase/nsk/jvmti/AddCapabilities/addcaps002/addcaps002.cpp
View file
Expand Up @@ -28,9 +28,7 @@
#include "jni_tools.h"
#include "jvmti_tools.h"

#ifdef __cplusplus
extern "C" {
#endif

/* ============================================================================= */

Expand Down Expand Up @@ -372,6 +370,4 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) {

/* ============================================================================= */

#ifdef __cplusplus
}
#endif
4 changes: 0 additions & 4 deletions test/hotspot/jtreg/vmTestbase/nsk/jvmti/AddCapabilities/addcaps003/addcaps003.cpp
View file
Expand Up @@ -27,9 +27,7 @@
#include "jni_tools.h"
#include "jvmti_tools.h"

#ifdef __cplusplus
extern "C" {
#endif

/* ============================================================================= */

Expand Down Expand Up @@ -221,6 +219,4 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) {

/* ============================================================================= */

#ifdef __cplusplus
}
#endif
4 changes: 0 additions & 4 deletions test/hotspot/jtreg/vmTestbase/nsk/jvmti/Agent_OnLoad/agentonload001/agentonload001.cpp
View file
Expand Up @@ -25,9 +25,7 @@
#include "agent_common.h"
#include "jvmti_tools.h"

#ifdef __cplusplus
extern "C" {
#endif

/* ============================================================================= */

Expand Down Expand Up @@ -88,6 +86,4 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) {

/* ============================================================================= */

#ifdef __cplusplus
}
#endif
4 changes: 0 additions & 4 deletions test/hotspot/jtreg/vmTestbase/nsk/jvmti/Agent_OnLoad/agentonload002/agentonload002.cpp
View file
Expand Up @@ -26,9 +26,7 @@
#include "jvmti.h"
#include "agent_common.h"

#ifdef __cplusplus
extern "C" {
#endif

/* ============================================================================= */

Expand Down Expand Up @@ -69,6 +67,4 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) {

/* ============================================================================= */

#ifdef __cplusplus
}
#endif
4 changes: 0 additions & 4 deletions test/hotspot/jtreg/vmTestbase/nsk/jvmti/Agent_OnLoad/agentonload003/agentonload003.cpp
View file
Expand Up @@ -26,9 +26,7 @@
#include "jvmti.h"
#include "agent_common.h"

#ifdef __cplusplus
extern "C" {
#endif

/* ============================================================================= */

Expand Down Expand Up @@ -69,6 +67,4 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) {

/* ============================================================================= */

#ifdef __cplusplus
}
#endif
4 changes: 0 additions & 4 deletions test/hotspot/jtreg/vmTestbase/nsk/jvmti/Agent_OnUnload/agentonunload001/agentonunload001.cpp
View file
Expand Up @@ -25,9 +25,7 @@
#include "agent_common.h"
#include "jvmti_tools.h"

#ifdef __cplusplus
extern "C" {
#endif

/* ============================================================================= */

Expand Down Expand Up @@ -83,6 +81,4 @@ Agent_OnUnload(JavaVM *jvm)

/* ============================================================================= */

#ifdef __cplusplus
}
#endif
4 changes: 0 additions & 4 deletions test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach002/attach002Agent00.cpp
View file
Expand Up @@ -28,9 +28,7 @@
#include <aod.h>
#include <jvmti_aod.h>

#ifdef __cplusplus
extern "C" {
#endif

/*
* Expected agent work scenario:
Expand Down Expand Up @@ -241,6 +239,4 @@ Agent_OnAttach(JavaVM *vm, char *optionsString, void *reserved)
return JNI_OK;
}

#ifdef __cplusplus
}
#endif
4 changes: 0 additions & 4 deletions test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach002a/attach002aAgent00.cpp
View file
Expand Up @@ -28,9 +28,7 @@
#include <aod.h>
#include <jvmti_aod.h>

#ifdef __cplusplus
extern "C" {
#endif

/*
* Expected agent work scenario:
Expand Down Expand Up @@ -130,6 +128,4 @@ Agent_OnAttach(JavaVM *vm, char *optionsString, void *reserved)
return JNI_OK;
}

#ifdef __cplusplus
}
#endif
4 changes: 0 additions & 4 deletions test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach008/attach008Agent00.cpp
View file
Expand Up @@ -28,9 +28,7 @@
#include <aod.h>
#include <jvmti_aod.h>

#ifdef __cplusplus
extern "C" {
#endif

/*
* Expected agent work scenario:
Expand Down Expand Up @@ -148,6 +146,4 @@ Agent_OnAttach(JavaVM *vm, char *optionsString, void *reserved)
return JNI_OK;
}

#ifdef __cplusplus
}
#endif
4 changes: 0 additions & 4 deletions test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach009/attach009Agent00.cpp
View file
Expand Up @@ -28,9 +28,7 @@
#include <aod.h>
#include <jvmti_aod.h>

#ifdef __cplusplus
extern "C" {
#endif

/*
* Expected agent work scenario:
Expand Down Expand Up @@ -160,6 +158,4 @@ Agent_OnAttach(JavaVM *vm, char *optionsString, void *reserved)
return JNI_OK;
}

#ifdef __cplusplus
}
#endif

2 comments on commit 510336c

@GoeLin
Copy link
Member

@GoeLin GoeLin commented on 510336c Nov 22, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/backport jdk11u-dev

@openjdk
Copy link

@openjdk openjdk bot commented on 510336c Nov 22, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@GoeLin the backport was successfully created on the branch GoeLin-backport-510336c2 in my personal fork of openjdk/jdk11u-dev. To create a pull request with this backport targeting openjdk/jdk11u-dev:master, just click the following link:

➡️ Create pull request

The title of the pull request is automatically filled in correctly and below you find a suggestion for the pull request body:

Hi all,

This pull request contains a backport of commit 510336c2 from the openjdk/jdk repository.

The commit being backported was authored by Jean Christophe Beyler on 18 Sep 2018 and was reviewed by David Holmes, Igor Ignatyev, Chris Plummer and Serguei Spitsyn.

Thanks!

If you need to update the source branch of the pull then run the following commands in a local clone of your personal fork of openjdk/jdk11u-dev:

$ git fetch https://github.com/openjdk-bots/jdk11u-dev GoeLin-backport-510336c2:GoeLin-backport-510336c2
$ git checkout GoeLin-backport-510336c2
# make changes
$ git add paths/to/changed/files
$ git commit --message 'Describe additional changes made'
$ git push https://github.com/openjdk-bots/jdk11u-dev GoeLin-backport-510336c2

Please sign in to comment.