diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2010-04-16 10:09:51 +0200 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2010-04-16 10:09:51 +0200 |
| commit | f5c946470831e39a42233a97b00d217c9299698d (patch) | |
| tree | bc5bf6d1581d005c2f9e663e3424855e292dcac6 /salhelper | |
| parent | df6d043734d640c98c73d2374aeabff90ef27b71 (diff) | |
| parent | a47e12b3d4eeb0b3e271588716f905092d06ac0b (diff) | |
CWS-TOOLING: integrate CWS sb118
Diffstat (limited to 'salhelper')
| -rw-r--r-- | salhelper/inc/salhelper/queue.hxx | 12 | ||||
| -rw-r--r-- | salhelper/qa/makefile.mk | 2 | ||||
| -rw-r--r-- | salhelper/test/rtti/sols.map | 2 |
3 files changed, 15 insertions, 1 deletions
diff --git a/salhelper/inc/salhelper/queue.hxx b/salhelper/inc/salhelper/queue.hxx index f0daa8e9a904..445cc5f32da1 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 1ce9ccb6f4ca..fe2aff7453be 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 962d648475f4..babf2c901585 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; |