diff options
Diffstat (limited to 'src/mongo/scripting/mozjs/PosixNSPR.cpp')
| -rw-r--r-- | src/mongo/scripting/mozjs/PosixNSPR.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/mongo/scripting/mozjs/PosixNSPR.cpp b/src/mongo/scripting/mozjs/PosixNSPR.cpp index 55a821450e6..f264b145f22 100644 --- a/src/mongo/scripting/mozjs/PosixNSPR.cpp +++ b/src/mongo/scripting/mozjs/PosixNSPR.cpp @@ -22,9 +22,9 @@ #include <js/Utility.h> #include <vm/PosixNSPR.h> +#include "mongo/platform/condition_variable.h" +#include "mongo/platform/mutex.h" #include "mongo/stdx/chrono.h" -#include "mongo/stdx/condition_variable.h" -#include "mongo/stdx/mutex.h" #include "mongo/stdx/thread.h" #include "mongo/util/concurrency/thread_name.h" #include "mongo/util/time_support.h" @@ -185,11 +185,11 @@ PRStatus PR_CallOnceWithArg(PRCallOnceType* once, PRCallOnceWithArgFN func, void } class nspr::Lock { - mongo::stdx::mutex mutex_; + mongo::Mutex mutex_; public: Lock() {} - mongo::stdx::mutex& mutex() { + mongo::Mutex& mutex() { return mutex_; } }; @@ -265,8 +265,8 @@ uint32_t PR_TicksPerSecond() { PRStatus PR_WaitCondVar(PRCondVar* cvar, uint32_t timeout) { if (timeout == PR_INTERVAL_NO_TIMEOUT) { try { - mongo::stdx::unique_lock<mongo::stdx::mutex> lk(cvar->lock()->mutex(), - mongo::stdx::adopt_lock_t()); + mongo::stdx::unique_lock<mongo::Mutex> lk(cvar->lock()->mutex(), + mongo::stdx::adopt_lock_t()); cvar->cond().wait(lk); lk.release(); @@ -277,8 +277,8 @@ PRStatus PR_WaitCondVar(PRCondVar* cvar, uint32_t timeout) { } } else { try { - mongo::stdx::unique_lock<mongo::stdx::mutex> lk(cvar->lock()->mutex(), - mongo::stdx::adopt_lock_t()); + mongo::stdx::unique_lock<mongo::Mutex> lk(cvar->lock()->mutex(), + mongo::stdx::adopt_lock_t()); cvar->cond().wait_for(lk, mongo::Microseconds(timeout).toSystemDuration()); lk.release(); |