coffee/cpp-ipc
1
0
Fork 0
mirror of https://github.com/mutouyun/cpp-ipc.git synced 2025-12-07 01:06:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix compile error for msvc

Browse Source
This commit is contained in:
mutouyun 2019-06-30 12:15:53 +08:00
parent 36d85e4b41
commit ad01ec62f5
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/memory/wrapper.h
View File

@ -133,20 +133,22 @@ public:
using alloc_policy = AllocP; using alloc_policy = AllocP;
private: private:
class alloc_proxy : public alloc_policy { spin_lock master_lock_;
std::vector<alloc_policy> master_allocs_;
class alloc_proxy : public AllocP {
async_wrapper * w_ = nullptr; async_wrapper * w_ = nullptr;
public: public:
alloc_proxy(alloc_proxy&& rhs) alloc_proxy(alloc_proxy&& rhs)
: alloc_policy(std::move(rhs)) : AllocP(std::move(rhs))
{} {}
alloc_proxy(async_wrapper* w) alloc_proxy(async_wrapper* w) : w_(w) {
: alloc_policy(), w_(w) {
if (w_ == nullptr) return; if (w_ == nullptr) return;
IPC_UNUSED_ auto guard = ipc::detail::unique_lock(w_->master_lock_); IPC_UNUSED_ auto guard = ipc::detail::unique_lock(w_->master_lock_);
if (!w_->master_allocs_.empty()) { if (!w_->master_allocs_.empty()) {
alloc_policy::swap(w_->master_allocs_.back()); AllocP::swap(w_->master_allocs_.back());
w_->master_allocs_.pop_back(); w_->master_allocs_.pop_back();
} }
} }
@ -160,9 +162,6 @@ private:
friend class alloc_proxy; friend class alloc_proxy;
spin_lock master_lock_;
std::vector<alloc_proxy> master_allocs_;
auto& get_alloc() { auto& get_alloc() {
static tls::pointer<alloc_proxy> tls_alc; static tls::pointer<alloc_proxy> tls_alc;
return *tls_alc.create(this); return *tls_alc.create(this);