From efbfe66f21a8865454bc7a9e32305c84c09ba4be Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Fri, 4 Jan 2013 20:50:26 +0100 Subject: Mutex: new wrapper for std::mutex, replaces GMutex --- src/thread/Mutex.hxx | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) create mode 100644 src/thread/Mutex.hxx (limited to 'src/thread/Mutex.hxx') diff --git a/src/thread/Mutex.hxx b/src/thread/Mutex.hxx new file mode 100644 index 000000000..df8d140c6 --- /dev/null +++ b/src/thread/Mutex.hxx @@ -0,0 +1,54 @@ +/* + * Copyright (C) 2003-2013 The Music Player Daemon Project + * http://www.musicpd.org + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +#ifndef MPD_THREAD_MUTEX_HXX +#define MPD_THREAD_MUTEX_HXX + +#ifdef WIN32 + +/* mingw-w64 4.6.3 lacks a std::mutex implementation */ + +#include "CriticalSection.hxx" +typedef CriticalSection Mutex; + +class ScopeLock { + Mutex &mutex; + +public: + ScopeLock(Mutex &_mutex):mutex(_mutex) { + mutex.lock(); + }; + + ~ScopeLock() { + mutex.unlock(); + }; + + ScopeLock(const ScopeLock &other) = delete; + ScopeLock &operator=(const ScopeLock &other) = delete; +}; + +#else + +#include +typedef std::mutex Mutex; +typedef std::lock_guard ScopeLock; + +#endif + +#endif -- cgit v1.2.3