openoffice-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dam...@apache.org
Subject svn commit: r1839811 - in /openoffice/trunk/main/salhelper: ./ inc/salhelper/ prj/ source/
Date Sat, 01 Sep 2018 08:37:37 GMT
Author: damjan
Date: Sat Sep  1 08:37:37 2018
New Revision: 1839811

URL: http://svn.apache.org/viewvc?rev=1839811&view=rev
Log:
Port main/salhelper to gbuild.

Patch by: me


Added:
    openoffice/trunk/main/salhelper/GoogleTest_salhelper_test.mk
    openoffice/trunk/main/salhelper/Library_salhelper.mk
    openoffice/trunk/main/salhelper/Makefile   (with props)
    openoffice/trunk/main/salhelper/Module_salhelper.mk
    openoffice/trunk/main/salhelper/Package_inc.mk
    openoffice/trunk/main/salhelper/inc/salhelper/salhelperdllapi.h   (with props)
    openoffice/trunk/main/salhelper/prj/makefile.mk
Modified:
    openoffice/trunk/main/salhelper/inc/salhelper/condition.hxx
    openoffice/trunk/main/salhelper/inc/salhelper/dynload.hxx
    openoffice/trunk/main/salhelper/inc/salhelper/simplereferenceobject.hxx
    openoffice/trunk/main/salhelper/prj/build.lst
    openoffice/trunk/main/salhelper/prj/d.lst
    openoffice/trunk/main/salhelper/source/gcc3.map
    openoffice/trunk/main/salhelper/source/gcc3os2.map

Added: openoffice/trunk/main/salhelper/GoogleTest_salhelper_test.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/salhelper/GoogleTest_salhelper_test.mk?rev=1839811&view=auto
==============================================================================
--- openoffice/trunk/main/salhelper/GoogleTest_salhelper_test.mk (added)
+++ openoffice/trunk/main/salhelper/GoogleTest_salhelper_test.mk Sat Sep  1 08:37:37 2018
@@ -0,0 +1,47 @@
+###############################################################
+#  
+#  Licensed to the Apache Software Foundation (ASF) under one
+#  or more contributor license agreements.  See the NOTICE file
+#  distributed with this work for additional information
+#  regarding copyright ownership.  The ASF licenses this file
+#  to you under the Apache License, Version 2.0 (the
+#  "License"); you may not use this file except in compliance
+#  with the License.  You may obtain a copy of the License at
+#  
+#    http://www.apache.org/licenses/LICENSE-2.0
+#  
+#  Unless required by applicable law or agreed to in writing,
+#  software distributed under the License is distributed on an
+#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#  KIND, either express or implied.  See the License for the
+#  specific language governing permissions and limitations
+#  under the License.
+#  
+###############################################################
+
+
+$(eval $(call gb_GoogleTest_GoogleTest,salhelper__test))
+
+$(eval $(call gb_GoogleTest_add_exception_objects,salhelper__test, \
+	salhelper/qa/main \
+	salhelper/qa/test_api \
+))
+
+$(eval $(call gb_GoogleTest_add_linked_libs,salhelper__test,\
+	sal \
+	salhelper \
+	stl \
+    $(gb_STDLIBS) \
+))
+
+#$(eval $(call gb_GoogleTest_add_api,salhelper_test,\
+#	udkapi \
+#	offapi \
+#))
+
+#$(eval $(call gb_GoogleTest_set_include,salhelper_test,\
+#	$$(INCLUDE) \
+#	-I$(SRCDIR)/salhelper/inc/pch \
+#))
+
+# vim: set noet sw=4 ts=4:

Added: openoffice/trunk/main/salhelper/Library_salhelper.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/salhelper/Library_salhelper.mk?rev=1839811&view=auto
==============================================================================
--- openoffice/trunk/main/salhelper/Library_salhelper.mk (added)
+++ openoffice/trunk/main/salhelper/Library_salhelper.mk Sat Sep  1 08:37:37 2018
@@ -0,0 +1,67 @@
+#**************************************************************
+#  
+#  Licensed to the Apache Software Foundation (ASF) under one
+#  or more contributor license agreements.  See the NOTICE file
+#  distributed with this work for additional information
+#  regarding copyright ownership.  The ASF licenses this file
+#  to you under the Apache License, Version 2.0 (the
+#  "License"); you may not use this file except in compliance
+#  with the License.  You may obtain a copy of the License at
+#  
+#    http://www.apache.org/licenses/LICENSE-2.0
+#  
+#  Unless required by applicable law or agreed to in writing,
+#  software distributed under the License is distributed on an
+#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#  KIND, either express or implied.  See the License for the
+#  specific language governing permissions and limitations
+#  under the License.
+#  
+#**************************************************************
+
+
+
+$(eval $(call gb_Library_Library,salhelper))
+
+$(eval $(call gb_Library_add_package_headers,salhelper,salhelper_inc))
+
+$(eval $(call gb_Library_set_include,salhelper,\
+	$$(INCLUDE) \
+	-I$(SRCDIR)/salhelper/inc \
+))
+
+#$(eval $(call gb_Library_add_api,salhelper, \
+#        udkapi \
+#	offapi \
+#))
+
+$(eval $(call gb_Library_add_defs,salhelper,\
+	-DSALHELPER_DLLIMPLEMENTATION \
+))
+
+ifeq ($(COMNAME),msci)
+$(eval $(call gb_Library_set_versionmap,salhelper,$(SRCDIR)/salhelper/source/msci.map))
+else ifeq ($(COMNAME),mscx)
+$(eval $(call gb_Library_set_versionmap,salhelper,$(SRCDIR)/salhelper/source/mscx.map))
+else ifeq ($(GUI),OS2)
+$(eval $(call gb_Library_set_versionmap,salhelper,$(SRCDIR)/salhelper/source/gcc3os2.map))
+else ifeq ($(COMNAME),sunpro5)
+$(eval $(call gb_Library_set_versionmap,salhelper,$(SRCDIR)/salhelper/source/sols.map))
+else ifeq ($(COMNAME),gcc3)
+$(eval $(call gb_Library_set_versionmap,salhelper,$(SRCDIR)/salhelper/source/gcc3.map))
+endif
+
+$(eval $(call gb_Library_add_linked_libs,salhelper,\
+	sal \
+	stl \
+	$(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,salhelper,\
+	salhelper/source/condition \
+	salhelper/source/dynload \
+	salhelper/source/simplereferenceobject \
+))
+
+# vim: set noet sw=4 ts=4:
+

Added: openoffice/trunk/main/salhelper/Makefile
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/salhelper/Makefile?rev=1839811&view=auto
==============================================================================
--- openoffice/trunk/main/salhelper/Makefile (added)
+++ openoffice/trunk/main/salhelper/Makefile Sat Sep  1 08:37:37 2018
@@ -0,0 +1,32 @@
+#**************************************************************
+#  
+#  Licensed to the Apache Software Foundation (ASF) under one
+#  or more contributor license agreements.  See the NOTICE file
+#  distributed with this work for additional information
+#  regarding copyright ownership.  The ASF licenses this file
+#  to you under the Apache License, Version 2.0 (the
+#  "License"); you may not use this file except in compliance
+#  with the License.  You may obtain a copy of the License at
+#  
+#    http://www.apache.org/licenses/LICENSE-2.0
+#  
+#  Unless required by applicable law or agreed to in writing,
+#  software distributed under the License is distributed on an
+#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#  KIND, either express or implied.  See the License for the
+#  specific language governing permissions and limitations
+#  under the License.
+#  
+#**************************************************************
+
+ifeq ($(strip $(SOLARENV)),)
+$(error No environment set!)
+endif
+
+gb_PARTIALBUILD := T
+GBUILDDIR := $(SOLARENV)/gbuild
+include $(GBUILDDIR)/gbuild.mk
+
+$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
+
+# vim: set noet sw=4 ts=4:

Propchange: openoffice/trunk/main/salhelper/Makefile
------------------------------------------------------------------------------
    svn:eol-style = native

Added: openoffice/trunk/main/salhelper/Module_salhelper.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/salhelper/Module_salhelper.mk?rev=1839811&view=auto
==============================================================================
--- openoffice/trunk/main/salhelper/Module_salhelper.mk (added)
+++ openoffice/trunk/main/salhelper/Module_salhelper.mk Sat Sep  1 08:37:37 2018
@@ -0,0 +1,38 @@
+#**************************************************************
+#  
+#  Licensed to the Apache Software Foundation (ASF) under one
+#  or more contributor license agreements.  See the NOTICE file
+#  distributed with this work for additional information
+#  regarding copyright ownership.  The ASF licenses this file
+#  to you under the Apache License, Version 2.0 (the
+#  "License"); you may not use this file except in compliance
+#  with the License.  You may obtain a copy of the License at
+#  
+#    http://www.apache.org/licenses/LICENSE-2.0
+#  
+#  Unless required by applicable law or agreed to in writing,
+#  software distributed under the License is distributed on an
+#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#  KIND, either express or implied.  See the License for the
+#  specific language governing permissions and limitations
+#  under the License.
+#  
+#**************************************************************
+
+
+
+$(eval $(call gb_Module_Module,salhelper))
+
+$(eval $(call gb_Module_add_targets,salhelper,\
+	Library_salhelper \
+	Package_inc \
+))
+
+ifeq ($(ENABLE_UNIT_TESTS),YES)
+$(eval $(call gb_Module_add_check_targets,salhelper,\
+        GoogleTest_salhelper_test \
+))
+endif
+
+
+# vim: set noet sw=4 ts=4:

Added: openoffice/trunk/main/salhelper/Package_inc.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/salhelper/Package_inc.mk?rev=1839811&view=auto
==============================================================================
--- openoffice/trunk/main/salhelper/Package_inc.mk (added)
+++ openoffice/trunk/main/salhelper/Package_inc.mk Sat Sep  1 08:37:37 2018
@@ -0,0 +1,34 @@
+#**************************************************************
+#  
+#  Licensed to the Apache Software Foundation (ASF) under one
+#  or more contributor license agreements.  See the NOTICE file
+#  distributed with this work for additional information
+#  regarding copyright ownership.  The ASF licenses this file
+#  to you under the Apache License, Version 2.0 (the
+#  "License"); you may not use this file except in compliance
+#  with the License.  You may obtain a copy of the License at
+#  
+#    http://www.apache.org/licenses/LICENSE-2.0
+#  
+#  Unless required by applicable law or agreed to in writing,
+#  software distributed under the License is distributed on an
+#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#  KIND, either express or implied.  See the License for the
+#  specific language governing permissions and limitations
+#  under the License.
+#  
+#**************************************************************
+
+
+
+$(eval $(call gb_Package_Package,salhelper_inc,$(SRCDIR)/salhelper/inc))
+$(eval $(call gb_Package_add_file,salhelper_inc,inc/salhelper/condition.hxx,salhelper/condition.hxx))
+$(eval $(call gb_Package_add_file,salhelper_inc,inc/salhelper/dynload.hxx,salhelper/dynload.hxx))
+$(eval $(call gb_Package_add_file,salhelper_inc,inc/salhelper/future.hxx,salhelper/future.hxx))
+$(eval $(call gb_Package_add_file,salhelper_inc,inc/salhelper/futurequeue.hxx,salhelper/futurequeue.hxx))
+$(eval $(call gb_Package_add_file,salhelper_inc,inc/salhelper/monitor.hxx,salhelper/monitor.hxx))
+$(eval $(call gb_Package_add_file,salhelper_inc,inc/salhelper/queue.hxx,salhelper/queue.hxx))
+$(eval $(call gb_Package_add_file,salhelper_inc,inc/salhelper/refobj.hxx,salhelper/refobj.hxx))
+$(eval $(call gb_Package_add_file,salhelper_inc,inc/salhelper/salhelperdllapi.h,salhelper/salhelperdllapi.h))
+$(eval $(call gb_Package_add_file,salhelper_inc,inc/salhelper/simplereferenceobject.hxx,salhelper/simplereferenceobject.hxx))
+$(eval $(call gb_Package_add_file,salhelper_inc,inc/salhelper/singletonref.hxx,salhelper/singletonref.hxx))

Modified: openoffice/trunk/main/salhelper/inc/salhelper/condition.hxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/salhelper/inc/salhelper/condition.hxx?rev=1839811&r1=1839810&r2=1839811&view=diff
==============================================================================
--- openoffice/trunk/main/salhelper/inc/salhelper/condition.hxx (original)
+++ openoffice/trunk/main/salhelper/inc/salhelper/condition.hxx Sat Sep  1 08:37:37 2018
@@ -28,7 +28,7 @@
 
 #include <osl/conditn.h>
 #include <osl/mutex.hxx>
-
+#include <salhelper/salhelperdllapi.h>
 
 namespace salhelper
 {
@@ -36,7 +36,7 @@ namespace salhelper
 	class ConditionWaiter;
 	
 	
-	class Condition
+	class SALHELPER_DLLPUBLIC Condition
 	{
 		friend class ConditionModifier;
 		friend class ConditionWaiter;		
@@ -63,7 +63,7 @@ namespace salhelper
 
 
 	
-	class ConditionModifier
+	class SALHELPER_DLLPUBLIC ConditionModifier
 	{
 	public:
 		
@@ -81,13 +81,13 @@ namespace salhelper
 
 
 	
-	class ConditionWaiter
+	class SALHELPER_DLLPUBLIC ConditionWaiter
 	{
 	public:
 
 		ConditionWaiter(Condition& aCond);
 		
-        struct timedout {
+        struct SALHELPER_DLLPUBLIC timedout {
             timedout();
 
             timedout(timedout const &);

Modified: openoffice/trunk/main/salhelper/inc/salhelper/dynload.hxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/salhelper/inc/salhelper/dynload.hxx?rev=1839811&r1=1839810&r2=1839811&view=diff
==============================================================================
--- openoffice/trunk/main/salhelper/inc/salhelper/dynload.hxx (original)
+++ openoffice/trunk/main/salhelper/inc/salhelper/dynload.hxx Sat Sep  1 08:37:37 2018
@@ -27,13 +27,14 @@
 #include <sal/types.h>
 #include <rtl/ustring.hxx>
 #include <osl/module.h>
+#include <salhelper/salhelperdllapi.h>
 
 namespace salhelper
 {
 
 /** The ORealDynamicLoader is an implementation helper class for the template loader ODynamicLoader.
  */   
-class ORealDynamicLoader
+class SALHELPER_DLLPUBLIC ORealDynamicLoader
 {
 public:
     /** initializes the loader, loads the library and call the initialization function.

Added: openoffice/trunk/main/salhelper/inc/salhelper/salhelperdllapi.h
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/salhelper/inc/salhelper/salhelperdllapi.h?rev=1839811&view=auto
==============================================================================
--- openoffice/trunk/main/salhelper/inc/salhelper/salhelperdllapi.h (added)
+++ openoffice/trunk/main/salhelper/inc/salhelper/salhelperdllapi.h Sat Sep  1 08:37:37 2018
@@ -0,0 +1,37 @@
+/**************************************************************
+ * 
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ * 
+ *************************************************************/
+
+
+
+#ifndef INCLUDED_SALHELPERDLLAPI_H
+#define INCLUDED_SALHELPERDLLAPI_H
+                                                                                        
                                    
+#include "sal/types.h"
+
+#if defined(SALHELPER_DLLIMPLEMENTATION)
+#define SALHELPER_DLLPUBLIC  SAL_DLLPUBLIC_EXPORT
+#else
+#define SALHELPER_DLLPUBLIC  SAL_DLLPUBLIC_IMPORT
+#endif
+#define SALHELPER_DLLPRIVATE SAL_DLLPRIVATE
+                                                                                    
+#endif /* INCLUDED_SALHELPERDLLAPI_H */
+

Propchange: openoffice/trunk/main/salhelper/inc/salhelper/salhelperdllapi.h
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: openoffice/trunk/main/salhelper/inc/salhelper/simplereferenceobject.hxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/salhelper/inc/salhelper/simplereferenceobject.hxx?rev=1839811&r1=1839810&r2=1839811&view=diff
==============================================================================
--- openoffice/trunk/main/salhelper/inc/salhelper/simplereferenceobject.hxx (original)
+++ openoffice/trunk/main/salhelper/inc/salhelper/simplereferenceobject.hxx Sat Sep  1 08:37:37
2018
@@ -36,6 +36,8 @@
 #define INCLUDED_NEW
 #endif
 
+#include <salhelper/salhelperdllapi.h>
+
 namespace salhelper {
 
 /** A simple base implementation for reference-counted objects.
@@ -64,7 +66,7 @@ namespace salhelper {
     objects are of no use, anyway, it seems best to simply declare and not
     define (private) operators new[] and delete[].
  */
-class SimpleReferenceObject
+class SALHELPER_DLLPUBLIC SimpleReferenceObject
 {
 public:
     inline SimpleReferenceObject() SAL_THROW(()): m_nCount(0) {}

Modified: openoffice/trunk/main/salhelper/prj/build.lst
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/salhelper/prj/build.lst?rev=1839811&r1=1839810&r2=1839811&view=diff
==============================================================================
--- openoffice/trunk/main/salhelper/prj/build.lst (original)
+++ openoffice/trunk/main/salhelper/prj/build.lst Sat Sep  1 08:37:37 2018
@@ -1,4 +1,2 @@
 shp	salhelper	:	sal NULL
-shp	salhelper		 	usr1	-	all	shp_mkout NULL
-shp	salhelper\source 	nmake	-	all shp_source NULL
-shp	salhelper\qa		nmake	-	all shp_qa shp_source NULL
+shp	salhelper\prj		nmake	-	all shp_prj NULL

Modified: openoffice/trunk/main/salhelper/prj/d.lst
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/salhelper/prj/d.lst?rev=1839811&r1=1839810&r2=1839811&view=diff
==============================================================================
--- openoffice/trunk/main/salhelper/prj/d.lst (original)
+++ openoffice/trunk/main/salhelper/prj/d.lst Sat Sep  1 08:37:37 2018
@@ -1,21 +0,0 @@
-mkdir: %_DEST%\inc%_EXT%\salhelper
-
-..\inc\salhelper\condition.hxx %_DEST%\inc%_EXT%\salhelper\condition.hxx
-..\inc\salhelper\dynload.hxx %_DEST%\inc%_EXT%\salhelper\dynload.hxx
-..\inc\salhelper\future.hxx %_DEST%\inc%_EXT%\salhelper\future.hxx
-..\inc\salhelper\futurequeue.hxx %_DEST%\inc%_EXT%\salhelper\futurequeue.hxx
-..\inc\salhelper\monitor.hxx %_DEST%\inc%_EXT%\salhelper\monitor.hxx
-..\inc\salhelper\queue.hxx %_DEST%\inc%_EXT%\salhelper\queue.hxx
-..\inc\salhelper\refobj.hxx %_DEST%\inc%_EXT%\salhelper\refobj.hxx
-..\inc\salhelper\simplereferenceobject.hxx %_DEST%\inc%_EXT%\salhelper\simplereferenceobject.hxx
-..\inc\salhelper\singletonref.hxx %_DEST%\inc%_EXT%\salhelper\singletonref.hxx
-
-..\%__SRC%\bin\salhelp*.dll %_DEST%\bin%_EXT%\salhelp*.dll
-..\%__SRC%\lib\*salhelper*.lib %_DEST%\lib%_EXT%\*
-
-..\%__SRC%\lib\libuno_salhelper*.*.* %_DEST%\lib%_EXT%\*
-
-..\%__SRC%\lib\libsalhelper*.a %_DEST%\lib%_EXT%\*
-..\%__SRC%\lib\salhelp*.lib %_DEST%\lib%_EXT%\*
-
-linklib: libuno_salhelper*.*.*

Added: openoffice/trunk/main/salhelper/prj/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/salhelper/prj/makefile.mk?rev=1839811&view=auto
==============================================================================
--- openoffice/trunk/main/salhelper/prj/makefile.mk (added)
+++ openoffice/trunk/main/salhelper/prj/makefile.mk Sat Sep  1 08:37:37 2018
@@ -0,0 +1,44 @@
+#**************************************************************
+#  
+#  Licensed to the Apache Software Foundation (ASF) under one
+#  or more contributor license agreements.  See the NOTICE file
+#  distributed with this work for additional information
+#  regarding copyright ownership.  The ASF licenses this file
+#  to you under the Apache License, Version 2.0 (the
+#  "License"); you may not use this file except in compliance
+#  with the License.  You may obtain a copy of the License at
+#  
+#    http://www.apache.org/licenses/LICENSE-2.0
+#  
+#  Unless required by applicable law or agreed to in writing,
+#  software distributed under the License is distributed on an
+#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#  KIND, either express or implied.  See the License for the
+#  specific language governing permissions and limitations
+#  under the License.
+#  
+#**************************************************************
+
+
+
+PRJ=..
+TARGET=prj
+
+.INCLUDE : settings.mk
+
+.IF "$(VERBOSE)"!=""
+VERBOSEFLAG :=
+.ELSE
+VERBOSEFLAG := -s
+.ENDIF
+
+.IF "$(DEBUG)"!=""
+DEBUG_ARGUMENT=DEBUG=$(DEBUG)
+.ELIF "$(debug)"!=""
+DEBUG_ARGUMENT=debug=$(debug)
+.ELSE
+DEBUG_ARGUMENT=
+.ENDIF
+
+all:
+	cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) $(DEBUG_ARGUMENT)
&& $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog

Modified: openoffice/trunk/main/salhelper/source/gcc3.map
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/salhelper/source/gcc3.map?rev=1839811&r1=1839810&r2=1839811&view=diff
==============================================================================
--- openoffice/trunk/main/salhelper/source/gcc3.map (original)
+++ openoffice/trunk/main/salhelper/source/gcc3.map Sat Sep  1 08:37:37 2018
@@ -40,13 +40,19 @@ UDK_3_0_0 { # should have been UDK_3.0
 	_ZN9salhelper21SimpleReferenceObjectnwE?; # salhelper::SimpleReferenceObject::operator new
(std::size_t)
 
 	_ZNK9salhelper18ORealDynamicLoader6getApiEv;
-    # _ZTIN9salhelper18ORealDynamicLoaderE;
-    # _ZTSN9salhelper18ORealDynamicLoaderE;
+	_ZTIN9salhelper18ORealDynamicLoaderE;
+	_ZTSN9salhelper18ORealDynamicLoaderE;
 	_ZTVN9salhelper18ORealDynamicLoaderE;
-    # _ZTIN9salhelper21SimpleReferenceObjectE;
-    # _ZTSN9salhelper21SimpleReferenceObjectE;
+	_ZTIN9salhelper21SimpleReferenceObjectE;
+	_ZTSN9salhelper21SimpleReferenceObjectE;
 	_ZTVN9salhelper21SimpleReferenceObjectE;
 
+	# Typeinfos that should be UDK_3.1, but were already UDK_3_0_0 prior to the gbuild port:
+	_ZTIN9salhelper15ConditionWaiter8timedoutE;
+	_ZTSN9salhelper15ConditionWaiter8timedoutE;
+	_ZTIN9salhelper9ConditionE;
+	_ZTSN9salhelper9ConditionE;
+
     local:
         *;
 };
@@ -65,8 +71,6 @@ UDK_3.1 {
         _ZN9salhelper9ConditionD0Ev;
         _ZN9salhelper9ConditionD1Ev;
         _ZN9salhelper9ConditionD2Ev;
-        # _ZTIN9salhelper9ConditionE;
-        # _ZTIS9salhelper9ConditionE;
 
         _ZN9salhelper17ConditionModifierC1ERNS_9ConditionE;
         _ZN9salhelper17ConditionModifierC2ERNS_9ConditionE;
@@ -88,6 +92,4 @@ UDK_3.1 {
         _ZN9salhelper15ConditionWaiter8timedoutD0Ev;
         _ZN9salhelper15ConditionWaiter8timedoutD1Ev;
         _ZN9salhelper15ConditionWaiter8timedoutD2Ev;
-        # _ZTIN9salhelper15ConditionWaiter8timedoutE;
-        # _ZTSN9salhelper15ConditionWaiter8timedoutE;
 } UDK_3_0_0;

Modified: openoffice/trunk/main/salhelper/source/gcc3os2.map
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/salhelper/source/gcc3os2.map?rev=1839811&r1=1839810&r2=1839811&view=diff
==============================================================================
--- openoffice/trunk/main/salhelper/source/gcc3os2.map (original)
+++ openoffice/trunk/main/salhelper/source/gcc3os2.map Sat Sep  1 08:37:37 2018
@@ -40,13 +40,19 @@ UDK_3_0_0 { # should have been UDK_3.0
 	_ZN9salhelper21SimpleReferenceObjectnwEj; # salhelper::SimpleReferenceObject::operator new
(std::size_t)
 
 	_ZNK9salhelper18ORealDynamicLoader6getApiEv;
-    # _ZTIN9salhelper18ORealDynamicLoaderE;
-    # _ZTSN9salhelper18ORealDynamicLoaderE;
+	_ZTIN9salhelper18ORealDynamicLoaderE;
+	_ZTSN9salhelper18ORealDynamicLoaderE;
 	_ZTVN9salhelper18ORealDynamicLoaderE;
-    # _ZTIN9salhelper21SimpleReferenceObjectE;
-    # _ZTSN9salhelper21SimpleReferenceObjectE;
+	_ZTIN9salhelper21SimpleReferenceObjectE;
+	_ZTSN9salhelper21SimpleReferenceObjectE;
 	_ZTVN9salhelper21SimpleReferenceObjectE;
 
+	# Typeinfos that should be UDK_3.1, but were already UDK_3_0_0 prior to the gbuild port:
+	_ZTIN9salhelper15ConditionWaiter8timedoutE;
+	_ZTSN9salhelper15ConditionWaiter8timedoutE;
+	_ZTIN9salhelper9ConditionE;
+	_ZTSN9salhelper9ConditionE;
+
     local:
         *;
 };
@@ -65,8 +71,6 @@ UDK_3.1 {
         _ZN9salhelper9ConditionD0Ev;
         _ZN9salhelper9ConditionD1Ev;
         _ZN9salhelper9ConditionD2Ev;
-        # _ZTIN9salhelper9ConditionE;
-        # _ZTIS9salhelper9ConditionE;
 
         _ZN9salhelper17ConditionModifierC1ERNS_9ConditionE;
         _ZN9salhelper17ConditionModifierC2ERNS_9ConditionE;
@@ -88,6 +92,4 @@ UDK_3.1 {
         _ZN9salhelper15ConditionWaiter8timedoutD0Ev;
         _ZN9salhelper15ConditionWaiter8timedoutD1Ev;
         _ZN9salhelper15ConditionWaiter8timedoutD2Ev;
-        # _ZTIN9salhelper15ConditionWaiter8timedoutE;
-        # _ZTSN9salhelper15ConditionWaiter8timedoutE;
 } UDK_3_0_0;



Mime
View raw message