summaryrefslogtreecommitdiff
path: root/src/mongo/scripting
diff options
context:
space:
mode:
authorAndy Schwerin <schwerin@mongodb.com>2015-03-04 10:30:44 -0500
committerAndy Schwerin <schwerin@mongodb.com>2015-03-05 17:35:14 -0500
commit59a9a04651486763b49ddb706a195bebccf76642 (patch)
tree335fa6d0cbc04f2c3577d2e4594e9a573f2b4594 /src/mongo/scripting
parentac525a4566a46b6b79a8465903b2ab0391eab506 (diff)
downloadmongo-59a9a04651486763b49ddb706a195bebccf76642.tar.gz
SERVER-17310 Replace boost::*_mutex::scoped_lock with boost::lock_guard.
Achieved via grep, sed and bash: grep -Irl mutex::scoped_lock src/mongo | xargs sed -i.orig -E 's/(boost::(recursive_|timed_)?)mutex::scoped_lock/boost::lock_guard<\1mutex>/' Then, by converting boost::lock_guard to boost::unique_lock as appropriate. Finally, by removing unused mongo::mutex::try_lock.
Diffstat (limited to 'src/mongo/scripting')
-rw-r--r--src/mongo/scripting/v8-3.25_utils.cpp4
-rw-r--r--src/mongo/scripting/v8_utils.cpp4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/mongo/scripting/v8-3.25_utils.cpp b/src/mongo/scripting/v8-3.25_utils.cpp
index 566f1b3b879..8daa4f4dacd 100644
--- a/src/mongo/scripting/v8-3.25_utils.cpp
+++ b/src/mongo/scripting/v8-3.25_utils.cpp
@@ -162,11 +162,11 @@ namespace mongo {
BSONObj _args;
BSONObj _returnData;
void setErrored(bool value) {
- boost::mutex::scoped_lock lck(_erroredMutex);
+ boost::lock_guard<boost::mutex> lck(_erroredMutex);
_errored = value;
}
bool getErrored() {
- boost::mutex::scoped_lock lck(_erroredMutex);
+ boost::lock_guard<boost::mutex> lck(_erroredMutex);
return _errored;
}
private:
diff --git a/src/mongo/scripting/v8_utils.cpp b/src/mongo/scripting/v8_utils.cpp
index 098d04e8123..a540666c61e 100644
--- a/src/mongo/scripting/v8_utils.cpp
+++ b/src/mongo/scripting/v8_utils.cpp
@@ -161,11 +161,11 @@ namespace mongo {
BSONObj _args;
BSONObj _returnData;
void setErrored(bool value) {
- boost::mutex::scoped_lock lck(_erroredMutex);
+ boost::lock_guard<boost::mutex> lck(_erroredMutex);
_errored = value;
}
bool getErrored() {
- boost::mutex::scoped_lock lck(_erroredMutex);
+ boost::lock_guard<boost::mutex> lck(_erroredMutex);
return _errored;
}
private: