summaryrefslogtreecommitdiff
path: root/salhelper
diff options
context:
space:
mode:
authorJens-Heiner Rechtien <hr@openoffice.org>2010-04-16 10:09:51 +0200
committerJens-Heiner Rechtien <hr@openoffice.org>2010-04-16 10:09:51 +0200
commit6d6d4c7498df9cfaef7e2021c0d8d5e6cec843d6 (patch)
tree77cbccbede02d8879f3537db73fcc4a1971ceeba /salhelper
parent0605733d262aa137eab069c25a714a465f9d5483 (diff)
parentfaf03243195fff183b1ae5d3558d635096f4a2f5 (diff)
CWS-TOOLING: integrate CWS sb118
Diffstat (limited to 'salhelper')
-rw-r--r--salhelper/inc/salhelper/queue.hxx12
-rw-r--r--salhelper/qa/makefile.mk2
-rw-r--r--salhelper/test/rtti/sols.map2
3 files changed, 15 insertions, 1 deletions
diff --git a/salhelper/inc/salhelper/queue.hxx b/salhelper/inc/salhelper/queue.hxx
index 1699a3b7e..a2ded2d60 100644
--- a/salhelper/inc/salhelper/queue.hxx
+++ b/salhelper/inc/salhelper/queue.hxx
@@ -93,6 +93,12 @@ public:
//----------------------------------------------------------------------------
+/** Queue.
+
+ @deprecated
+ Must not be used, as it internally uses unnamed semaphores, which are not
+ supported on Mac OS X.
+*/
template<class element_type>
class Queue : protected QueueBase<element_type>
{
@@ -130,6 +136,12 @@ public:
//----------------------------------------------------------------------------
+/** Bounded queue.
+
+ @deprecated
+ Must not be used, as it internally uses unnamed semaphores, which are not
+ supported on Mac OS X.
+*/
template<class element_type>
class BoundedQueue : protected Queue<element_type>
{
diff --git a/salhelper/qa/makefile.mk b/salhelper/qa/makefile.mk
index 1ce9ccb6f..fe2aff745 100644
--- a/salhelper/qa/makefile.mk
+++ b/salhelper/qa/makefile.mk
@@ -33,6 +33,8 @@ ENABLE_EXCEPTIONS := TRUE
.INCLUDE: settings.mk
+CFLAGSCXX += $(CPPUNIT_CFLAGS)
+
SHL1TARGET = $(TARGET)
SHL1OBJS = $(SLO)$/test_api.obj
SHL1STDLIBS = $(CPPUNITLIB) $(SALLIB) $(SALHELPERLIB) $(TESTSHL2LIB)
diff --git a/salhelper/test/rtti/sols.map b/salhelper/test/rtti/sols.map
index 962d64847..babf2c901 100644
--- a/salhelper/test/rtti/sols.map
+++ b/salhelper/test/rtti/sols.map
@@ -1,4 +1,4 @@
-SAMPLELIB {
+UDK_3_0_0 {
global:
GetVersionInfo;
_fini;