From e6438318b8565bbfcd611398b0a6f986fc84ffbc Mon Sep 17 00:00:00 2001
From: Shinichiro Hamaji <shinichiro.hamaji@gmail.com>
Date: Tue, 16 Feb 2016 14:04:05 +0900
Subject: [C++] Rename mutex related classes

libc++'s sstream indirectly includes mutex, which conflicts
with ours.
---
 regen.cc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'regen.cc')

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_;
 };
-- 
cgit v1.2.3