Make Mutex_Factory an abstract class, move the creation of the no-op

Default_Mutex to the new Default_Mutex_Factory

2 files changed, 6 insertions, 2 deletions

diff --git a/src/init_def.cpp b/src/init_def.cpp
index 21cc07aaa..05631127c 100644
--- a/src/init_def.cpp
+++ b/src/init_def.cpp
@@ -41,7 +41,11 @@ void initialize(const InitializerOptions& args)
 
    set_global_state(
       new Library_State(
-         args.thread_safe() ? modules.mutex_factory() : new Mutex_Factory));
+         args.thread_safe() ?
+            modules.mutex_factory() :
+            new Default_Mutex_Factory
+         )
+      );
 
    global_state().config().load_defaults();
    if(args.config_file() != "")
diff --git a/src/mutex.cpp b/src/mutex.cpp
index a6d18a44c..89cbacbb1 100644
--- a/src/mutex.cpp
+++ b/src/mutex.cpp
@@ -46,7 +46,7 @@ Named_Mutex_Holder::~Named_Mutex_Holder()
 /*************************************************
 * Default Mutex Factory                          *
 *************************************************/
-Mutex* Mutex_Factory::make()
+Mutex* Default_Mutex_Factory::make()
    {
    class Default_Mutex : public Mutex
       {