[Libreoffice-commits] core.git: Branch 'aoo/trunk' - salhelper/GoogleTest_salhelper_test.mk salhelper/inc salhelper/Library_salhelper.mk salhelper/Makefile salhelper/Module_salhelper.mk salhelper/Package_inc.mk salhelper/prj salhelper/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Sat Sep 1 10:09:26 UTC 2018
salhelper/GoogleTest_salhelper_test.mk | 47 +++++++++++++++
salhelper/Library_salhelper.mk | 67 ++++++++++++++++++++++
salhelper/Makefile | 32 ++++++++++
salhelper/Module_salhelper.mk | 38 ++++++++++++
salhelper/Package_inc.mk | 34 +++++++++++
salhelper/inc/salhelper/condition.hxx | 10 +--
salhelper/inc/salhelper/dynload.hxx | 3
salhelper/inc/salhelper/salhelperdllapi.h | 37 ++++++++++++
salhelper/inc/salhelper/simplereferenceobject.hxx | 4 -
salhelper/prj/build.lst | 4 -
salhelper/prj/d.lst | 21 ------
salhelper/prj/makefile.mk | 44 ++++++++++++++
salhelper/source/gcc3.map | 18 +++--
salhelper/source/gcc3os2.map | 18 +++--
14 files changed, 330 insertions(+), 47 deletions(-)
New commits:
commit 423afc8ac55c22f9a7481072213bef91350dc04a
Author: Damjan Jovanovic <damjan at apache.org>
AuthorDate: Sat Sep 1 08:37:37 2018 +0000
Commit: Damjan Jovanovic <damjan at apache.org>
CommitDate: Sat Sep 1 08:37:37 2018 +0000
Port main/salhelper to gbuild.
Patch by: me
diff --git a/salhelper/GoogleTest_salhelper_test.mk b/salhelper/GoogleTest_salhelper_test.mk
new file mode 100644
index 000000000000..9be0262a463c
--- /dev/null
+++ b/salhelper/GoogleTest_salhelper_test.mk
@@ -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:
diff --git a/salhelper/Library_salhelper.mk b/salhelper/Library_salhelper.mk
new file mode 100644
index 000000000000..eb636f0048c0
--- /dev/null
+++ b/salhelper/Library_salhelper.mk
@@ -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:
+
diff --git a/salhelper/Makefile b/salhelper/Makefile
new file mode 100644
index 000000000000..c1d144cbd4c9
--- /dev/null
+++ b/salhelper/Makefile
@@ -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:
diff --git a/salhelper/Module_salhelper.mk b/salhelper/Module_salhelper.mk
new file mode 100644
index 000000000000..17fcac5f2956
--- /dev/null
+++ b/salhelper/Module_salhelper.mk
@@ -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:
diff --git a/salhelper/Package_inc.mk b/salhelper/Package_inc.mk
new file mode 100644
index 000000000000..db32a6fa5b77
--- /dev/null
+++ b/salhelper/Package_inc.mk
@@ -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))
diff --git a/salhelper/inc/salhelper/condition.hxx b/salhelper/inc/salhelper/condition.hxx
index 3ebb6c1f679c..5ae22feead58 100644
--- a/salhelper/inc/salhelper/condition.hxx
+++ b/salhelper/inc/salhelper/condition.hxx
@@ -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 &);
diff --git a/salhelper/inc/salhelper/dynload.hxx b/salhelper/inc/salhelper/dynload.hxx
index 862712fa1e31..3a29ee233fa4 100644
--- a/salhelper/inc/salhelper/dynload.hxx
+++ b/salhelper/inc/salhelper/dynload.hxx
@@ -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.
diff --git a/salhelper/inc/salhelper/salhelperdllapi.h b/salhelper/inc/salhelper/salhelperdllapi.h
new file mode 100644
index 000000000000..02f4b6fa4347
--- /dev/null
+++ b/salhelper/inc/salhelper/salhelperdllapi.h
@@ -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 */
+
diff --git a/salhelper/inc/salhelper/simplereferenceobject.hxx b/salhelper/inc/salhelper/simplereferenceobject.hxx
index 975354719b64..e567ea85635e 100644
--- a/salhelper/inc/salhelper/simplereferenceobject.hxx
+++ b/salhelper/inc/salhelper/simplereferenceobject.hxx
@@ -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) {}
diff --git a/salhelper/prj/build.lst b/salhelper/prj/build.lst
index cc7b7a464c2e..00fc800592c4 100644
--- a/salhelper/prj/build.lst
+++ b/salhelper/prj/build.lst
@@ -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
diff --git a/salhelper/prj/d.lst b/salhelper/prj/d.lst
index 5f98260691e1..e69de29bb2d1 100644
--- a/salhelper/prj/d.lst
+++ b/salhelper/prj/d.lst
@@ -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*.*.*
diff --git a/salhelper/prj/makefile.mk b/salhelper/prj/makefile.mk
new file mode 100644
index 000000000000..c62c6a657d16
--- /dev/null
+++ b/salhelper/prj/makefile.mk
@@ -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
diff --git a/salhelper/source/gcc3.map b/salhelper/source/gcc3.map
index fc0a34102c4a..0c4686c600f8 100644
--- a/salhelper/source/gcc3.map
+++ b/salhelper/source/gcc3.map
@@ -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;
diff --git a/salhelper/source/gcc3os2.map b/salhelper/source/gcc3os2.map
index 332127ed649c..03dd0d5af396 100644
--- a/salhelper/source/gcc3os2.map
+++ b/salhelper/source/gcc3os2.map
@@ -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;
More information about the Libreoffice-commits
mailing list