[Libreoffice-commits] .: Branch 'libreoffice-3-3' - jvmaccess/util

[René Engelhard]

 jvmaccess/util/cc5_solaris_sparc.map |    4 ++--
 jvmaccess/util/gcc3.map              |    4 ++--
 jvmaccess/util/msvc_win32_intel.map  |    4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit f6dd33db015d23f30c4934ad05d5b2838b42ac48
Author: sb <sb at openoffice.org>
Date:   Wed Nov 17 15:17:56 2010 +0100

    sb136: #i114155# partially revert fix for i108776 to avoid ABI incompatibility of jvmaccess library

diff --git a/jvmaccess/util/cc5_solaris_sparc.map b/jvmaccess/util/cc5_solaris_sparc.map
index 3072290..09d7ba7 100644
--- a/jvmaccess/util/cc5_solaris_sparc.map
+++ b/jvmaccess/util/cc5_solaris_sparc.map
@@ -25,7 +25,7 @@
 #
 #*************************************************************************
 
-UDK_3_0_0 {
+UDK_3.1 {
     global:
         # jvmaccess/virtualmachine.hxx:
         __1cJjvmaccessOVirtualMachineLAttachGuardRCreationException2t6M_v_; # jvmaccess::VirtualMachine::AttachGuard::CreationException::CreationException()
@@ -52,7 +52,7 @@ UDK_3.2 {
         __1cJjvmaccesscQ__RTTI__1CpnJjvmaccessOVirtualMachineLAttachGuardRCreationException__; # RTTI for jvmaccess::VirtualMachine::AttachGuard::CreationException *
         __1cJjvmaccesscR__RTTI__1CpknJjvmaccessOVirtualMachineLAttachGuardRCreationException__; # RTTI for jvmaccess::VirtualMachine::AttachGuard::CreationException const *
         __1cJjvmaccessOVirtualMachine2t5B6MpnHJavaVM__ibpnHJNIEnv___v_; # jvmaccess::VirtualMachine::VirtualMachine(JavaVM *, int, bool, JNIEnv *) #Nvariant 1
-} UDK_3_0_0;
+} UDK_3.1;
 
 UDK_3.3 {
     global:
diff --git a/jvmaccess/util/gcc3.map b/jvmaccess/util/gcc3.map
index 2a888d9..6702986 100644
--- a/jvmaccess/util/gcc3.map
+++ b/jvmaccess/util/gcc3.map
@@ -25,7 +25,7 @@
 #
 #*************************************************************************
 
-UDK_3_0_0 {
+UDK_3.1 {
     global:
         # jvmaccess/virtualmachine.hxx:
         _ZN9jvmaccess14VirtualMachine11AttachGuard17CreationExceptionC1Ev; # jvmaccess::VirtualMachine::AttachGuard::CreationException::CreationException()
@@ -59,7 +59,7 @@ UDK_3.2 {
     # We put the '*' at the beginning because its unlikely that these symbols will ever be a postfix of another symbol.
         _*ZN9jvmaccess14VirtualMachineC1EP10_Jv_JavaVMibP10_Jv_JNIEnv; # jvmaccess::VirtualMachine::VirtualMachine(JavaVM *, int, bool, JNIEnv *)
         _*ZN9jvmaccess14VirtualMachineC2EP10_Jv_JavaVMibP10_Jv_JNIEnv; # jvmaccess::VirtualMachine::VirtualMachine(JavaVM *, int, bool, JNIEnv *)
-} UDK_3_0_0;
+} UDK_3.1;
 
 UDK_3.3 {
     global:
diff --git a/jvmaccess/util/msvc_win32_intel.map b/jvmaccess/util/msvc_win32_intel.map
index 4620b1c..fd148b1 100644
--- a/jvmaccess/util/msvc_win32_intel.map
+++ b/jvmaccess/util/msvc_win32_intel.map
@@ -1,4 +1,4 @@
-UDK_3_0_0 {
+UDK_3.1 {
     global:
         # jvmaccess/virtualmachine.hxx:
         ??0CreationException at AttachGuard@VirtualMachine at jvmaccess@@QAE at XZ; # jvmaccess::VirtualMachine::AttachGuard::CreationException::CreationException()
@@ -15,7 +15,7 @@ UDK_3_0_0 {
 
 UDK_3.2 {
     global:
-} UDK_3_0_0;
+} UDK_3.1;
 
 UDK_3.3 {
     global: