From e297475f0d05b3c8cfbc5cee90add7d7a37c6a02 Mon Sep 17 00:00:00 2001 From: Even Rouault Date: Wed, 2 Jun 2021 18:07:46 +0200 Subject: Cleanup: add proj/internal/mutex.hpp as compat layer for mingw32 for std::mutex --- include/proj/internal/Makefile.am | 3 +- include/proj/internal/mutex.hpp | 61 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 63 insertions(+), 1 deletion(-) create mode 100644 include/proj/internal/mutex.hpp (limited to 'include') diff --git a/include/proj/internal/Makefile.am b/include/proj/internal/Makefile.am index b3fb57eb..59325667 100644 --- a/include/proj/internal/Makefile.am +++ b/include/proj/internal/Makefile.am @@ -6,5 +6,6 @@ noinst_HEADERS = \ io_internal.hpp \ lru_cache.hpp \ include_nlohmann_json.hpp \ - tracing.hpp + tracing.hpp \ + mutex.hpp diff --git a/include/proj/internal/mutex.hpp b/include/proj/internal/mutex.hpp new file mode 100644 index 00000000..a378be40 --- /dev/null +++ b/include/proj/internal/mutex.hpp @@ -0,0 +1,61 @@ +/****************************************************************************** + * + * Project: PROJ + * Purpose: std::mutex emulation + * Author: Even Rouault + * + ****************************************************************************** + * Copyright (c) 2021, Even Rouault + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included + * in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS + * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + ****************************************************************************/ + +#include "proj/util.hpp" +#include "proj_internal.h" + +#ifndef __MINGW32__ +#include +#endif + +NS_PROJ_START + +#ifdef __MINGW32__ +// mingw32-win32 doesn't implement std::mutex +class mutex { + public: + // cppcheck-suppress functionStatic + void lock() { pj_acquire_lock(); } + // cppcheck-suppress functionStatic + void unlock() { pj_release_lock(); } +}; + +template struct lock_guard { + Lock &lock_; + lock_guard(Lock &lock) : lock_(lock) { lock_.lock(); } + ~lock_guard() { lock_.unlock(); } +}; + +#else + +typedef std::mutex mutex; +template using lock_guard = std::lock_guard; + +#endif + +NS_PROJ_END -- cgit v1.2.3