diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2017-08-28 15:47:32 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2017-08-28 15:47:32 +0200 |
| commit | 4ecc6555878027f1cc0f853e1aa023f12167f96f (patch) | |
| tree | 3c3b5293af846ad4ff9c3176f3594502cc29e3fa /bridges/inc | |
| parent | 52ffad9bb7be800790de6d918154dbeade88cadd (diff) | |
Replace use of oslInterlockedCount with std::atomic in bridges
Change-Id: Iad47a01fd283345a2461eaaea50633bf840e5201
Diffstat (limited to 'bridges/inc')
| -rw-r--r-- | bridges/inc/bridge.hxx | 8 | ||||
| -rw-r--r-- | bridges/inc/cppinterfaceproxy.hxx | 8 | ||||
| -rw-r--r-- | bridges/inc/unointerfaceproxy.hxx | 8 |
3 files changed, 18 insertions, 6 deletions
diff --git a/bridges/inc/bridge.hxx b/bridges/inc/bridge.hxx index 5e3b146217b0..a01bb42bc163 100644 --- a/bridges/inc/bridge.hxx +++ b/bridges/inc/bridge.hxx @@ -20,7 +20,11 @@ #ifndef INCLUDED_BRIDGES_INC_BRIDGE_HXX #define INCLUDED_BRIDGES_INC_BRIDGE_HXX -#include "osl/interlck.h" +#include <sal/config.h> + +#include <atomic> +#include <cstddef> + #include "sal/types.h" #include "typelib/typedescription.h" #include "uno/environment.h" @@ -90,7 +94,7 @@ private: Bridge * pBridge; }; - oslInterlockedCount nRef; + std::atomic<std::size_t> nRef; uno_ExtEnvironment * pCppEnv; uno_ExtEnvironment * pUnoEnv; diff --git a/bridges/inc/cppinterfaceproxy.hxx b/bridges/inc/cppinterfaceproxy.hxx index ccd83660059a..00972829a53c 100644 --- a/bridges/inc/cppinterfaceproxy.hxx +++ b/bridges/inc/cppinterfaceproxy.hxx @@ -20,7 +20,11 @@ #ifndef INCLUDED_BRIDGES_INC_CPPINTERFACEPROXY_HXX #define INCLUDED_BRIDGES_INC_CPPINTERFACEPROXY_HXX -#include "osl/interlck.h" +#include <sal/config.h> + +#include <atomic> +#include <cstddef> + #include "rtl/ustring.hxx" #include "sal/types.h" #include "typelib/typedescription.h" @@ -84,7 +88,7 @@ private: static com::sun::star::uno::XInterface * castProxyToInterface( CppInterfaceProxy * pProxy); - oslInterlockedCount nRef; + std::atomic<std::size_t> nRef; Bridge * pBridge; // mapping information diff --git a/bridges/inc/unointerfaceproxy.hxx b/bridges/inc/unointerfaceproxy.hxx index c9697d3491a8..c76b62dd28b0 100644 --- a/bridges/inc/unointerfaceproxy.hxx +++ b/bridges/inc/unointerfaceproxy.hxx @@ -20,7 +20,11 @@ #ifndef INCLUDED_BRIDGES_INC_UNOINTERFACEPROXY_HXX #define INCLUDED_BRIDGES_INC_UNOINTERFACEPROXY_HXX -#include "osl/interlck.h" +#include <sal/config.h> + +#include <atomic> +#include <cstddef> + #include "rtl/ustring.hxx" #include "sal/types.h" #include "typelib/typedescription.h" @@ -83,7 +87,7 @@ private: ~UnoInterfaceProxy(); - oslInterlockedCount nRef; + std::atomic<std::size_t> nRef; Bridge * pBridge; // mapping information |