diff options
| author | agaliuzov <agaliuzov@luxoft.com> | 2016-03-24 17:32:44 +0200 |
|---|---|---|
| committer | agaliuzov <agaliuzov@luxoft.com> | 2016-03-24 17:32:44 +0200 |
| commit | d1fcbfbd5c56f2f9b206932224f89ff03d608591 (patch) | |
| tree | 5e3ec2ace08baf87a765f4d9e458a0529324ca8d /src/components/connection_handler/include/connection_handler/connection_handler_impl.h | |
| parent | e84d3b5048e653c466f9daef301cb77578651d13 (diff) | |
| parent | ea2eaa6a2ac6b4ce59aa3f8e89086aaff1db08b0 (diff) | |
| download | sdl_core-d1fcbfbd5c56f2f9b206932224f89ff03d608591.tar.gz | |
Merge remote-tracking branch 'upstream/master' into develop
Diffstat (limited to 'src/components/connection_handler/include/connection_handler/connection_handler_impl.h')
| -rw-r--r-- | src/components/connection_handler/include/connection_handler/connection_handler_impl.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/components/connection_handler/include/connection_handler/connection_handler_impl.h b/src/components/connection_handler/include/connection_handler/connection_handler_impl.h index 71d51e48b1..b6b13b57c1 100644 --- a/src/components/connection_handler/include/connection_handler/connection_handler_impl.h +++ b/src/components/connection_handler/include/connection_handler/connection_handler_impl.h @@ -451,7 +451,7 @@ class ConnectionHandlerImpl : public ConnectionHandler, * \brief Lock for applications list */ mutable sync_primitives::RWLock connection_list_lock_; - mutable sync_primitives::Lock connection_handler_observer_lock_; + mutable sync_primitives::RWLock connection_handler_observer_lock_; /** * \brief Cleans connection list on destruction |