diff --git a/.travis.yml b/.travis.yml index 24bc258..e194bbc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,7 +14,7 @@ matrix: include: - compiler: gcc env: - - MATRIX_EVAL="CC=gcc-7 && CXX=g++-7" + - MATRIX_EVAL="USING_CMAKE=0 CC=gcc-7 && CXX=g++-7" - compiler: clang - compiler: clang env: diff --git a/src/memory/resource.hpp b/src/memory/resource.hpp index 6573643..aee1676 100644 --- a/src/memory/resource.hpp +++ b/src/memory/resource.hpp @@ -34,7 +34,7 @@ constexpr void static_for(std::index_sequence, F&& f) { #else /*__cplusplus < 201703L*/ inline void static_for(std::index_sequence, F&& f) { #endif/*__cplusplus < 201703L*/ - auto IPC_UNUSED_ expand = { (f(std::integral_constant{}), 0)... }; + IPC_UNUSED_ auto expand = { (f(std::integral_constant{}), 0)... }; } template diff --git a/src/memory/wrapper.hpp b/src/memory/wrapper.hpp index 92f7416..d97da4e 100644 --- a/src/memory/wrapper.hpp +++ b/src/memory/wrapper.hpp @@ -53,7 +53,7 @@ private: alloc_t(synchronized* t) : t_ { t } { { - auto IPC_UNUSED_ guard = ipc::detail::unique_lock(t_->lc_); + IPC_UNUSED_ auto guard = ipc::detail::unique_lock(t_->lc_); auto it = t_->allocs_.begin(); if (it != t_->allocs_.end()) { std::tie(s_, a_) = *it; @@ -66,7 +66,7 @@ private: } ~alloc_t() { - auto IPC_UNUSED_ guard = ipc::detail::unique_lock(t_->lc_); + IPC_UNUSED_ auto guard = ipc::detail::unique_lock(t_->lc_); t_->allocs_.emplace(s_, a_); } diff --git a/src/platform/shm_linux.cpp b/src/platform/shm_linux.cpp index baf79e0..c41d57c 100644 --- a/src/platform/shm_linux.cpp +++ b/src/platform/shm_linux.cpp @@ -66,7 +66,7 @@ void* acquire(char const * name, std::size_t size) { auto acc = acc_of(mem); acc->fetch_add(1, std::memory_order_release); { - auto IPC_UNUSED_ guard = ipc::detail::unique_lock(m2h()->lc_); + IPC_UNUSED_ auto guard = ipc::detail::unique_lock(m2h()->lc_); m2h()->cache_.emplace(++acc, std::move(op_name)); } return acc; @@ -76,7 +76,7 @@ void release(void* mem, std::size_t size) { if (mem == nullptr) { return; } - auto IPC_UNUSED_ guard = ipc::detail::unique_lock(m2h()->lc_); + IPC_UNUSED_ auto guard = ipc::detail::unique_lock(m2h()->lc_); auto& cc = m2h()->cache_; auto it = cc.find(mem); if (it == cc.end()) { diff --git a/src/platform/shm_win.cpp b/src/platform/shm_win.cpp index 225e38b..3e6a671 100644 --- a/src/platform/shm_win.cpp +++ b/src/platform/shm_win.cpp @@ -43,7 +43,7 @@ void* acquire(char const * name, std::size_t size) { return nullptr; } { - auto IPC_UNUSED_ guard = ipc::detail::unique_lock(m2h()->lc_); + IPC_UNUSED_ auto guard = ipc::detail::unique_lock(m2h()->lc_); m2h()->cache_.emplace(mem, h); } return mem; @@ -53,7 +53,7 @@ void release(void* mem, std::size_t /*size*/) { if (mem == nullptr) { return; } - auto IPC_UNUSED_ guard = ipc::detail::unique_lock(m2h()->lc_); + IPC_UNUSED_ auto guard = ipc::detail::unique_lock(m2h()->lc_); auto& cc = m2h()->cache_; auto it = cc.find(mem); if (it == cc.end()) { diff --git a/src/platform/waiter_linux.h b/src/platform/waiter_linux.h index 2ffec49..cd3bd27 100644 --- a/src/platform/waiter_linux.h +++ b/src/platform/waiter_linux.h @@ -60,7 +60,7 @@ public: if (::pthread_mutexattr_init(&mutex_attr) != 0) { return invalid(); } - auto IPC_UNUSED_ guard_mutex_attr = unique_ptr(&mutex_attr, ::pthread_mutexattr_destroy); + IPC_UNUSED_ auto guard_mutex_attr = unique_ptr(&mutex_attr, ::pthread_mutexattr_destroy); if (::pthread_mutexattr_setpshared(&mutex_attr, PTHREAD_PROCESS_SHARED) != 0) { return invalid(); } @@ -73,7 +73,7 @@ public: if (::pthread_condattr_init(&cond_attr) != 0) { return invalid(); } - auto IPC_UNUSED_ guard_cond_attr = unique_ptr(&cond_attr, ::pthread_condattr_destroy); + IPC_UNUSED_ auto guard_cond_attr = unique_ptr(&cond_attr, ::pthread_condattr_destroy); if (::pthread_condattr_setpshared(&cond_attr, PTHREAD_PROCESS_SHARED) != 0) { return invalid(); } @@ -102,7 +102,7 @@ public: if (::pthread_mutex_lock(&(w->mutex_)) != 0) { return false; } - auto IPC_UNUSED_ guard = unique_ptr(&(w->mutex_), ::pthread_mutex_unlock); + IPC_UNUSED_ auto guard = unique_ptr(&(w->mutex_), ::pthread_mutex_unlock); if (::pthread_cond_wait(&(w->cond_), &(w->mutex_)) != 0) { return false; }