Merge "Remove mutex.h and its uses." am: 33414a8b5f am: 88c992f080 am: e1fcb21fa2 (06baa018) · Commits · e / os / android_system_core

base/include/android-base/mutex.h

deleted100644 → 0

+0 −49

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2016 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		#pragma once

		#include <mutex>

		#include "android-base/macros.h"

		#if defined(_WIN32)
		#include <windows.h>

		namespace std {
		class mutex {
		public:
		mutex() {
		InitializeCriticalSection(&critical_section_);
		}
		~mutex() {
		DeleteCriticalSection(&critical_section_);
		}

		void lock() {
		EnterCriticalSection(&critical_section_);
		}

		void unlock() {
		LeaveCriticalSection(&critical_section_);
		}

		private:
		CRITICAL_SECTION critical_section_;
		DISALLOW_COPY_AND_ASSIGN(mutex);
		};
		} // namespace std
		#endif

+0 −1

Original line number	Diff line number	Diff line
		@@ -44,7 +44,6 @@
		#include <vector>

		#include "android-base/macros.h"
		#include "android-base/mutex.h"
		#include "android-base/strings.h"

		// Headers for LogMessage::LogLine.

+0 −2