summaryrefslogtreecommitdiff
path: root/mysqlc
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2016-09-19 21:18:23 +0200
committerStephan Bergmann <sbergman@redhat.com>2016-09-20 07:55:10 +0200
commit07339d03afe742c53c22cb4ff5f73fe3132cff54 (patch)
treec746a8f0eea7ca16d6b6756b604303eefbf550e7 /mysqlc
parentece7079f77efea3fcbd205209fb16f6c9a12bf3f (diff)
Remove obsolete workaround for SUNPRO 5 compiler
...copy/pasted into three more places Change-Id: I6661244d0248af509cd867fc3e8c451551068a78
Diffstat (limited to 'mysqlc')
-rw-r--r--mysqlc/source/mysqlc_subcomponent.hxx24
1 files changed, 13 insertions, 11 deletions
diff --git a/mysqlc/source/mysqlc_subcomponent.hxx b/mysqlc/source/mysqlc_subcomponent.hxx
index 384eeeec923c..404143973831 100644
--- a/mysqlc/source/mysqlc_subcomponent.hxx
+++ b/mysqlc/source/mysqlc_subcomponent.hxx
@@ -100,17 +100,7 @@ namespace connectivity
public:
OPropertyArrayUsageHelper();
- virtual ~OPropertyArrayUsageHelper()
- { // ARGHHHHHHH ..... would like to implement this in proparrhlp_impl.hxx (as we do with all other methods)
- // but SUNPRO 5 compiler (linker) doesn't like this
- ::osl::MutexGuard aGuard(s_aMutex);
- OSL_ENSURE(s_nRefCount > 0, "OPropertyArrayUsageHelper::~OPropertyArrayUsageHelper : suspicious call : have a refcount of 0 !");
- if (!--s_nRefCount)
- {
- delete s_pProps;
- s_pProps = nullptr;
- }
- }
+ virtual ~OPropertyArrayUsageHelper();
/** call this in the getInfoHelper method of your derived class. The method returns the array helper of the
class, which is created if necessary.
@@ -147,6 +137,18 @@ namespace connectivity
}
template <class TYPE>
+ OPropertyArrayUsageHelper<TYPE>::~OPropertyArrayUsageHelper()
+ {
+ ::osl::MutexGuard aGuard(s_aMutex);
+ OSL_ENSURE(s_nRefCount > 0, "OPropertyArrayUsageHelper::~OPropertyArrayUsageHelper : suspicious call : have a refcount of 0 !");
+ if (!--s_nRefCount)
+ {
+ delete s_pProps;
+ s_pProps = nullptr;
+ }
+ }
+
+ template <class TYPE>
::cppu::IPropertyArrayHelper* OPropertyArrayUsageHelper<TYPE>::getArrayHelper()
{
OSL_ENSURE(s_nRefCount, "OPropertyArrayUsageHelper::getArrayHelper : suspicious call : have a refcount of 0 !");