diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2003-03-26 11:41:32 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2003-03-26 11:41:32 +0000 |
| commit | 44bf5dacd75eec3d27acf9590a29ce49a3b585cf (patch) | |
| tree | d4bf189a381cfc27c683a3f105927c66a63fa0e9 /jvmaccess/inc | |
| parent | b7ea5b0ca567c0ce8272148244e4579dcec548a7 (diff) | |
MWS_SRX644: migrate branch mws_srx644 -> HEAD
Diffstat (limited to 'jvmaccess/inc')
| -rw-r--r-- | jvmaccess/inc/jvmaccess/virtualmachine.hxx | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/jvmaccess/inc/jvmaccess/virtualmachine.hxx b/jvmaccess/inc/jvmaccess/virtualmachine.hxx index 3fd8f1728ef5..e04cef4ee4bf 100644 --- a/jvmaccess/inc/jvmaccess/virtualmachine.hxx +++ b/jvmaccess/inc/jvmaccess/virtualmachine.hxx @@ -2,9 +2,9 @@ * * $RCSfile: virtualmachine.hxx,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: sb $ $Date: 2002-12-06 11:33:26 $ + * last change: $Author: hr $ $Date: 2003-03-26 12:41:13 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -138,7 +138,10 @@ public: @param nVersion The JNI version of the virtual machine pointed to by pVm. Must be at - least JNI_VERSION_1_2. + least JNI_VERSION_1_2. This parameter should be of type jint, not int, + but at least on some platforms the definition of jint changed from + JDK 1.3 (long) to JDK 1.4 (int), so that the mangled C++ name of the + constructor would depend on the JDK version used at compile time. @param bDestroy Whether to destroy the virtual machine when destructing the wrapper @@ -160,7 +163,7 @@ public: the virtual machine use the context class loader of the "initial Java thread." */ - VirtualMachine(JavaVM * pVm, jint nVersion, bool bDestroy, + VirtualMachine(JavaVM * pVm, int nVersion, bool bDestroy, JNIEnv * pMainThreadEnv); private: |