aboutsummaryrefslogtreecommitdiffstats
path: root/regen.cc
diff options
context:
space:
mode:
authorShinichiro Hamaji <shinichiro.hamaji@gmail.com>2016-02-16 14:04:05 +0900
committerShinichiro Hamaji <shinichiro.hamaji@gmail.com>2016-02-16 14:04:05 +0900
commite6438318b8565bbfcd611398b0a6f986fc84ffbc (patch)
tree5f43a7ca9a2b253d8076608fc3d72f7243c90f77 /regen.cc
parent1a444a870705b263cb4ee080ddfafde42c0f5563 (diff)
downloadandroid_build_kati-e6438318b8565bbfcd611398b0a6f986fc84ffbc.tar.gz
android_build_kati-e6438318b8565bbfcd611398b0a6f986fc84ffbc.tar.bz2
android_build_kati-e6438318b8565bbfcd611398b0a6f986fc84ffbc.zip
[C++] Rename mutex related classes
libc++'s sstream indirectly includes mutex, which conflicts with ours.
Diffstat (limited to 'regen.cc')
-rw-r--r--regen.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/regen.cc b/regen.cc
index a40ebf3..a448612 100644
--- a/regen.cc
+++ b/regen.cc
@@ -364,7 +364,7 @@ class StampChecker {
// TODO: Make glob cache thread safe and create a task for each glob.
for (GlobResult* gr : globs_) {
if (CheckGlobResult(gr, &err)) {
- unique_lock<mutex> lock(mu_);
+ UniqueLock<Mutex> lock(mu_);
if (!needs_regen_) {
needs_regen_ = true;
msg_ = err;
@@ -378,7 +378,7 @@ class StampChecker {
tp->Submit([this, sr]() {
string err;
if (CheckShellResult(sr, &err)) {
- unique_lock<mutex> lock(mu_);
+ UniqueLock<Mutex> lock(mu_);
if (!needs_regen_) {
needs_regen_ = true;
msg_ = err;
@@ -398,7 +398,7 @@ class StampChecker {
double gen_time_;
vector<GlobResult*> globs_;
vector<ShellResult*> commands_;
- mutex mu_;
+ Mutex mu_;
bool needs_regen_;
string msg_;
};