summaryrefslogtreecommitdiffstats
path: root/base
diff options
context:
space:
mode:
authorPirama Arumuga Nainar <pirama@google.com>2016-09-16 15:57:19 -0700
committerPirama Arumuga Nainar <pirama@google.com>2016-09-16 15:58:00 -0700
commit70f281ae362917d6b5aa8707d092819f3c88c61b (patch)
tree54db67a30e7366a6e1e8ae26b9a9970360978daa /base
parenta3d7b240f19863ee71dafe9494fddfc6629117d2 (diff)
downloadcore-70f281ae362917d6b5aa8707d092819f3c88c61b.tar.gz
core-70f281ae362917d6b5aa8707d092819f3c88c61b.tar.bz2
core-70f281ae362917d6b5aa8707d092819f3c88c61b.zip
Remove mutex.h and its uses.
mutex.h is now available as a part of MinGW itself. Test: Successful build Change-Id: I036ee37600a39130d6fbf293398585cfc58209ca
Diffstat (limited to 'base')
-rw-r--r--base/include/android-base/mutex.h49
-rw-r--r--base/logging.cpp1
-rw-r--r--base/quick_exit.cpp2
3 files changed, 0 insertions, 52 deletions
diff --git a/base/include/android-base/mutex.h b/base/include/android-base/mutex.h
deleted file mode 100644
index 22e75c794..000000000
--- a/base/include/android-base/mutex.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * 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
diff --git a/base/logging.cpp b/base/logging.cpp
index 33313e4a6..77a0a43c3 100644
--- a/base/logging.cpp
+++ b/base/logging.cpp
@@ -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.
diff --git a/base/quick_exit.cpp b/base/quick_exit.cpp
index fa671224e..e4dd62bfb 100644
--- a/base/quick_exit.cpp
+++ b/base/quick_exit.cpp
@@ -21,8 +21,6 @@
#include <mutex>
#include <vector>
-#include "android-base/mutex.h"
-
namespace android {
namespace base {