hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Allow mxs::rworker_local<const T>

Browse Source 
By removing the constness of the type for the actual stored value, the
return values of the access operators are defined by the type itself. This
allows both const and non-const types to be stored in a rworker_local
object.
This commit is contained in:
Markus Mäkelä
2018-08-31 07:37:50 +03:00
parent db1d72fb19
commit ce7a59fb56
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
include/maxscale/routingworker.hh
View File

@ -17,6 +17,7 @@
#include <unordered_map>
#include <vector>
#include <mutex>
#include <type_traits>
#include <maxbase/semaphore.hh>
#include <maxbase/worker.hh>
@ -462,14 +463,14 @@ public:
mxs_rworker_delete_data(m_handle);
}
// Converts to a const T reference
operator const T&() const
// Converts to a T reference
operator T&() const
{
return *get_local_value();
}
// Arrow operator
const T* operator->() const
T* operator->() const
{
return get_local_value();
}
@ -494,9 +495,9 @@ public:
private:
uint64_t m_handle;
mutable std::mutex m_lock;
T m_value; // The "master" value, never used directly
uint64_t m_handle; // The handle to the worker local data
typename std::remove_const<T>::type m_value; // The master value, never used directly
mutable std::mutex m_lock; // Protects the master value
private: