Attachment #5882 for issue #11720

View | Details | Raw Unified | Return to issue 11720
Collapse All | Expand All

Lines 138-144 Link Here

(-)oo_cvs/jvmaccess/inc/jvmaccess/virtualmachine.hxx (-2 / +5 lines)
138		138
139	@param nVersion	139	@param nVersion
140	The JNI version of the virtual machine pointed to by pVm. Must be at	140	The JNI version of the virtual machine pointed to by pVm. Must be at
141	least JNI_VERSION_1_2.	141	least JNI_VERSION_1_2. This parameter should be of type jint, not int,
		142	but at least on some platforms the definition of jint changed from
		143	JDK 1.3 (long) to JDK 1.4 (int), so that the mangled C++ name of the
		144	constructor would depend on the JDK version used at compile time.
142		145
143	@param bDestroy	146	@param bDestroy
144	Whether to destroy the virtual machine when destructing the wrapper	147	Whether to destroy the virtual machine when destructing the wrapper
Lines 160-166 Link Here
160	the virtual machine use the context class loader of the "initial Java	163	the virtual machine use the context class loader of the "initial Java
161	thread."	164	thread."
162	*/	165	*/
163	VirtualMachine(JavaVM * pVm, jint nVersion, bool bDestroy,	166	VirtualMachine(JavaVM * pVm, int nVersion, bool bDestroy,
164	JNIEnv * pMainThreadEnv);	167	JNIEnv * pMainThreadEnv);
165		168
166	private:	169	private:

Lines 1-4 Link Here

(-)oo_cvs/jvmaccess/prj/build.lst (-1 / +1 lines)
1	jv jvmaccess : cppu sal salhelper NULL	1	jv jvmaccess : ridljar cppu sal salhelper NULL
2	jv jvmaccess usr1 - all jv_mkout NULL	2	jv jvmaccess usr1 - all jv_mkout NULL
3	jv jvmaccess\source nmake - all jv_source NULL	3	jv jvmaccess\source nmake - all jv_source NULL
4	jv jvmaccess\util nmake - all jv_util jv_source NULL	4	jv jvmaccess\util nmake - all jv_util jv_source NULL

Lines 120-129 Link Here

(-)oo_cvs/jvmaccess/source/javainfoimpl.cxx (-1 / +11 lines)
120	with DEFAULT_SEARCH_PATH to find a Java if no JAVA_HOME, PATH or LD_LIBRARY_PATH	120	with DEFAULT_SEARCH_PATH to find a Java if no JAVA_HOME, PATH or LD_LIBRARY_PATH
121	contains a Java.	121	contains a Java.
122	*/	122	*/
123	#define JAVA_DIR_NAMES "j2re1.4.1_01", \	123	#define JAVA_DIR_NAMES "j2re1.4.1_02", \
		124	"j2sdk1.4.1_02", \
		125	"j2re1.4.1_01", \
124	"j2sdk1.4.1_01", \	126	"j2sdk1.4.1_01", \
125	"j2re1.4.1", \	127	"j2re1.4.1", \
126	"j2sdk1.4.1", \	128	"j2sdk1.4.1", \
		129	"j2re1.4.0_03", \
		130	"j2sdk1.4.0_03", \
127	"j2re1.4.0_02", \	131	"j2re1.4.0_02", \
128	"j2sdk1.4.0_02", \	132	"j2sdk1.4.0_02", \
129	"j2re1.4.0_01", \	133	"j2re1.4.0_01", \
Lines 132-137 Link Here
132	"j2sdk1.4.0", \	136	"j2sdk1.4.0", \
133	"j2re1_3_1_04", \	137	"j2re1_3_1_04", \
134	"j2sdk1_3_1_04", \	138	"j2sdk1_3_1_04", \
		139	"jre1.3.1_07", \
		140	"jdk1.3.1_07", \
		141	"jre1.3.1_06", \
		142	"jdk1.3.1_06", \
		143	"jre1.3.1_05", \
		144	"jdk1.3.1_05", \
135	"jre1.3.1_04", \	145	"jre1.3.1_04", \
136	"jdk1.3.1_04", \	146	"jdk1.3.1_04", \
137	"j2re1_3_1_03", \	147	"j2re1_3_1_03", \

Lines 98-104 Link Here

(-)oo_cvs/jvmaccess/source/virtualmachine.cxx (-1 / +1 lines)
98	m_xMachine->detachThread();	98	m_xMachine->detachThread();
99	}	99	}
100		100
101	VirtualMachine::VirtualMachine(JavaVM * pVm, jint nVersion, bool bDestroy,	101	VirtualMachine::VirtualMachine(JavaVM * pVm, int nVersion, bool bDestroy,
102	JNIEnv * pMainThreadEnv):	102	JNIEnv * pMainThreadEnv):
103	m_pVm(pVm), m_nVersion(nVersion), m_bDestroy(bDestroy)	103	m_pVm(pVm), m_nVersion(nVersion), m_bDestroy(bDestroy)
104	{	104	{

Lines 38-44 Link Here

(-)oo_cvs/jvmaccess/util/cc5_solaris_sparc.map (-1 / +1 lines)
38	__1cJjvmaccessOVirtualMachineLAttachGuard2t5B6MrknDrtlJReference4n0B____v_; # jvmaccess::VirtualMachine::AttachGuard::AttachGuard(rtl::Reference< VirtualMachine > const &) #Nvariant 1	38	__1cJjvmaccessOVirtualMachineLAttachGuard2t5B6MrknDrtlJReference4n0B____v_; # jvmaccess::VirtualMachine::AttachGuard::AttachGuard(rtl::Reference< VirtualMachine > const &) #Nvariant 1
39	__1cJjvmaccessOVirtualMachineLAttachGuard2T6M_v_; # jvmaccess::VirtualMachine::AttachGuard::~AttachGuard()	39	__1cJjvmaccessOVirtualMachineLAttachGuard2T6M_v_; # jvmaccess::VirtualMachine::AttachGuard::~AttachGuard()
40	__1cJjvmaccessOVirtualMachineLAttachGuard2T5B6M_v_; # jvmaccess::VirtualMachine::AttachGuard::~AttachGuard() #Nvariant 1	40	__1cJjvmaccessOVirtualMachineLAttachGuard2T5B6M_v_; # jvmaccess::VirtualMachine::AttachGuard::~AttachGuard() #Nvariant 1
41	__1cJjvmaccessOVirtualMachine2t6MpnHJavaVM__ibpnHJNIEnv___v_; # jvmaccess::VirtualMachine::VirtualMachine(JavaVM , jint, bool, JNIEnv )	41	__1cJjvmaccessOVirtualMachine2t6MpnHJavaVM__ibpnHJNIEnv___v_; # jvmaccess::VirtualMachine::VirtualMachine(JavaVM , int, bool, JNIEnv )
42		42
43	local:	43	local:
44	*;	44	*;

Lines 36-42 Link Here

(-)oo_cvs/jvmaccess/util/gcc3_linux_intel.map (-1 / +1 lines)
36	_ZN9jvmaccess14VirtualMachine11AttachGuardC2ERKN3rtl9ReferenceIS0_EE; # jvmaccess::VirtualMachine::AttachGuard::AttachGuard(rtl::Reference< VirtualMachine > const &)	36	_ZN9jvmaccess14VirtualMachine11AttachGuardC2ERKN3rtl9ReferenceIS0_EE; # jvmaccess::VirtualMachine::AttachGuard::AttachGuard(rtl::Reference< VirtualMachine > const &)
37	_ZN9jvmaccess14VirtualMachine11AttachGuardD1Ev; # jvmaccess::VirtualMachine::AttachGuard::~AttachGuard()	37	_ZN9jvmaccess14VirtualMachine11AttachGuardD1Ev; # jvmaccess::VirtualMachine::AttachGuard::~AttachGuard()
38	_ZN9jvmaccess14VirtualMachine11AttachGuardD2Ev; # jvmaccess::VirtualMachine::AttachGuard::~AttachGuard()	38	_ZN9jvmaccess14VirtualMachine11AttachGuardD2Ev; # jvmaccess::VirtualMachine::AttachGuard::~AttachGuard()
39	_ZN9jvmaccess14VirtualMachineC1EP7JavaVM_ibP7JNIEnv_; # jvmaccess::VirtualMachine::VirtualMachine(JavaVM , jint, bool, JNIEnv )	39	_ZN9jvmaccess14VirtualMachineC1EP7JavaVM_ibP7JNIEnv_; # jvmaccess::VirtualMachine::VirtualMachine(JavaVM , int, bool, JNIEnv )
40		40
41	local:	41	local:
42	*;	42	*;

Lines 30-36 Link Here

(-)oo_cvs/jvmaccess/util/msvc_win32_intel.map (-1 / +1 lines)
30	??4CreationException@AttachGuard@VirtualMachine@jvmaccess@@QAEAAV0123@ABV0123@@Z; # jvmaccess::VirtualMachine::AttachGuard::CreationException::operator =(CreationException const &)	30	??4CreationException@AttachGuard@VirtualMachine@jvmaccess@@QAEAAV0123@ABV0123@@Z; # jvmaccess::VirtualMachine::AttachGuard::CreationException::operator =(CreationException const &)
31	??0AttachGuard@VirtualMachine@jvmaccess@@QAE@ABV?$Reference@VVirtualMachine@jvmaccess@@@rtl@@@Z; # jvmaccess::VirtualMachine::AttachGuard::AttachGuard(rtl::Reference< VirtualMachine > const &)	31	??0AttachGuard@VirtualMachine@jvmaccess@@QAE@ABV?$Reference@VVirtualMachine@jvmaccess@@@rtl@@@Z; # jvmaccess::VirtualMachine::AttachGuard::AttachGuard(rtl::Reference< VirtualMachine > const &)
32	??1AttachGuard@VirtualMachine@jvmaccess@@QAE@XZ; # jvmaccess::VirtualMachine::AttachGuard::~AttachGuard()	32	??1AttachGuard@VirtualMachine@jvmaccess@@QAE@XZ; # jvmaccess::VirtualMachine::AttachGuard::~AttachGuard()
33	??0VirtualMachine@jvmaccess@@QAE@PAUJavaVM_@@J_NPAUJNIEnv_@@@Z; # jvmaccess::VirtualMachine::VirtualMachine(JavaVM , jint, bool, JNIEnv )	33	??0VirtualMachine@jvmaccess@@QAE@PAUJavaVM_@@H_NPAUJNIEnv_@@@Z; # jvmaccess::VirtualMachine::VirtualMachine(JavaVM , int, bool, JNIEnv )
34		34
35	local:	35	local:
36	*;	36	*;

Return to issue 11720