Replace use of oslInterlockedCount with std::atomic

The assumption in using std::size_t is that every acquisition can be associated
with a unique memory location in the local address space, so the counter cannot
overflow.

Change-Id: I0d004a81d9bf52cf07d13481d9024fcc10b6db6d
Reviewed-on: https://gerrit.libreoffice.org/41580
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
This commit is contained in:
Stephan Bergmann
2017-08-25 22:46:11 +02:00
parent 1584d5215c
commit e9d64ca080
2 changed files with 6 additions and 4 deletions
+2 -2
View File
@@ -76,13 +76,13 @@ Proxy::Proxy(
void Proxy::do_acquire() {
if (osl_atomic_increment(&references_) == 1) {
if (++references_ == 1) {
bridge_->resurrectProxy(*this);
}
}
void Proxy::do_release() {
if (osl_atomic_decrement(&references_) == 0) {
if (--references_ == 0) {
bridge_->revokeProxy(*this);
}
}
+4 -2
View File
@@ -22,7 +22,9 @@
#include "sal/config.h"
#include "osl/interlck.h"
#include <atomic>
#include <cstddef>
#include "rtl/ref.hxx"
#include "rtl/ustring.hxx"
#include "typelib/typedescription.h"
@@ -78,7 +80,7 @@ private:
rtl::Reference< Bridge > bridge_;
OUString oid_;
com::sun::star::uno::TypeDescription type_;
oslInterlockedCount references_;
std::atomic<std::size_t> references_;
};
}