Remove the mutex classes in favor of C++0x's std::mutex and std::lock_guard

3 files changed, 1 insertions, 57 deletions

diff --git a/src/utils/info.txt b/src/utils/info.txt
index ffc19c852..815ad4efc 100644
--- a/src/utils/info.txt
+++ b/src/utils/info.txt
@@ -27,7 +27,6 @@ exceptn.h
 loadstor.h
 mem_ops.h
 mlock.cpp
-mutex.h
 parsing.cpp
 parsing.h
 rotate.h
diff --git a/src/utils/mutex.h b/src/utils/mutex.h
deleted file mode 100644
index a04ff83c9..000000000
--- a/src/utils/mutex.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
-* Mutex
-* (C) 1999-2007 Jack Lloyd
-*
-* Distributed under the terms of the Botan license
-*/
-
-#ifndef BOTAN_MUTEX_H__
-#define BOTAN_MUTEX_H__
-
-#include <botan/exceptn.h>
-
-namespace Botan {
-
-/*
-* Mutex Base Class
-*/
-class BOTAN_DLL Mutex
-   {
-   public:
-      virtual void lock() = 0;
-      virtual void unlock() = 0;
-      virtual ~Mutex() {}
-   };
-
-/*
-* Mutex Factory
-*/
-class BOTAN_DLL Mutex_Factory
-   {
-   public:
-      virtual Mutex* make() = 0;
-      virtual ~Mutex_Factory() {}
-   };
-
-/*
-* Mutex Holding Class
-*/
-class BOTAN_DLL Mutex_Holder
-   {
-   public:
-      Mutex_Holder(Mutex* m) : mux(m)
-         {
-         if(!mux)
-            throw Invalid_Argument("Mutex_Holder: Argument was NULL");
-         mux->lock();
-         }
-
-      ~Mutex_Holder() { mux->unlock(); }
-   private:
-      Mutex* mux;
-   };
-
-}
-
-#endif
diff --git a/src/utils/scan_name.cpp b/src/utils/scan_name.cpp
index 3425425e2..92fded3c4 100644
--- a/src/utils/scan_name.cpp
+++ b/src/utils/scan_name.cpp
@@ -8,6 +8,7 @@ SCAN Name Abstraction
 #include <botan/scan_name.h>
 #include <botan/parsing.h>
 #include <botan/libstate.h>
+#include <botan/exceptn.h>
 #include <stdexcept>
 
 #include <iostream>