-// ManagedStatics can get created during execution of static constructors. As a
-// result, we cannot use a global static std::mutex object for the lock since it
-// may not have been constructed. Instead, we do a call-once initialization of
-// a pointer to a mutex.
-static std::once_flag MutexInitializationFlag;
-static std::recursive_mutex* ManagedStaticMutex = nullptr;
-
-// Not all supported platforms (in particular VS2012) have thread-safe function
-// static initialization, so roll our own.
-static std::recursive_mutex& GetManagedStaticMutex() {
- std::call_once(MutexInitializationFlag,
- []() { ManagedStaticMutex = new std::recursive_mutex(); } );
-
- return *ManagedStaticMutex;
+static sys::Mutex& getManagedStaticMutex() {
+ // We need to use a function local static here, since this can get called
+ // during a static constructor and we need to guarantee that it's initialized
+ // correctly.
+ static sys::Mutex ManagedStaticMutex;
+ return ManagedStaticMutex;