summaryrefslogtreecommitdiff
path: root/salhelper/inc/salhelper/simplereferenceobject.hxx
diff options
context:
space:
mode:
authorMatúš Kukan <matus.kukan@gmail.com>2011-07-28 19:11:15 +0200
committerStephan Bergmann <sbergman@redhat.com>2011-12-15 11:59:03 +0100
commita4312af08cbd8c69ba4bead9608f3bf549caf7a0 (patch)
tree0f682527bc5be83f0fd87617dda41f0856ab7291 /salhelper/inc/salhelper/simplereferenceobject.hxx
parent9dab9a26aeaeeaabcef3f4900597ca57e7411a2d (diff)
convert salhelper to gbuild
This is a cherry-pick of Matúš's e2f30c078fcf26d481c2e90398b450f6c475a483 from the feature/gbuild branch, with the following modifications by Stephan Bergmann <sbergman@redhat.com>: * Adapt salhelper/Makefile to what all those Makefiles currently need to look like. * Do not remove salhelper/source/gcc3.map, instead add directly into it what otherwise solenv/bin/addsym.awk would add to it on Linux. * In salhelper/Library_salhelper.mk, add code that on Linux takes care of the soname and symbol versioning required for backwards compatibility. Solaris would need those features too, and its backwards compatibility is thus currently broken. Also add a bad hack to create the soname symlink (xxx.3 -> xxx) in the solver needed on non-Windows platforms (it is a bad hack for now in that it e.g. is not removed by "make clean"). * In solenv/gbuild/platform/macosx.mk, add an even worse hack to set the correct install name for libuno_salhelpergcc3.dylib.3, with a trailing ".3".
Diffstat (limited to 'salhelper/inc/salhelper/simplereferenceobject.hxx')
-rw-r--r--salhelper/inc/salhelper/simplereferenceobject.hxx7
1 files changed, 4 insertions, 3 deletions
diff --git a/salhelper/inc/salhelper/simplereferenceobject.hxx b/salhelper/inc/salhelper/simplereferenceobject.hxx
index 43ca44033d3b..13c8d658400d 100644
--- a/salhelper/inc/salhelper/simplereferenceobject.hxx
+++ b/salhelper/inc/salhelper/simplereferenceobject.hxx
@@ -31,6 +31,7 @@
#include "osl/interlck.h"
#include "sal/types.h"
+#include "salhelperdllapi.h"
#ifndef INCLUDED_CSTDDEF
#include <cstddef>
@@ -69,7 +70,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) {}
@@ -114,12 +115,12 @@ private:
/** not implemented
@internal
*/
- SimpleReferenceObject(SimpleReferenceObject &);
+ SALHELPER_DLLPRIVATE SimpleReferenceObject(SimpleReferenceObject &);
/** not implemented
@internal
*/
- void operator =(SimpleReferenceObject);
+ SALHELPER_DLLPRIVATE void operator =(SimpleReferenceObject);
#ifdef _MSC_VER
/* We can't now have these private with MSVC2008 at least, it leads to