Inline a number of small objects that are only used in a local context

(ie, a single function). This will, unfortunately, break GCC 2.95.x
support. Most of the operating systems that had shipped with 2.95.x,
like OpenBSD and QNX, have since upgraded. Anyone needing 2.95.x support
will have to continue using 1.4.x

1 files changed, 22 insertions, 37 deletions

diff --git a/src/mutex.cpp b/src/mutex.cpp
index 1b6c7b2d6..f96849409 100644
--- a/src/mutex.cpp
+++ b/src/mutex.cpp
@@ -7,43 +7,6 @@
 
 namespace Botan {
 
-namespace {
-
-/*************************************************
-* Default Mutex                                  *
-*************************************************/
-class Default_Mutex : public Mutex
-   {
-   public:
-      void lock();
-      void unlock();
-      Default_Mutex() { locked = false; }
-   private:
-      bool locked;
-   };
-
-/*************************************************
-* Lock the mutex                                 *
-*************************************************/
-void Default_Mutex::lock()
-   {
-   if(locked)
-      throw Internal_Error("Default_Mutex::lock: Mutex is already locked");
-   locked = true;
-   }
-
-/*************************************************
-* Unlock the mutex                               *
-*************************************************/
-void Default_Mutex::unlock()
-   {
-   if(!locked)
-      throw Internal_Error("Default_Mutex::unlock: Mutex is already unlocked");
-   locked = false;
-   }
-
-}
-
 /*************************************************
 * Mutex_Holder Constructor                       *
 *************************************************/
@@ -67,6 +30,28 @@ Mutex_Holder::~Mutex_Holder()
 *************************************************/
 Mutex* Mutex_Factory::make()
    {
+   class Default_Mutex : public Mutex
+      {
+      public:
+         void lock()
+            {
+            if(locked)
+               throw Internal_Error("Default_Mutex::lock: Mutex is already locked");
+            locked = true;
+            }
+
+         void unlock()
+            {
+            if(!locked)
+               throw Internal_Error("Default_Mutex::unlock: Mutex is already unlocked");
+            locked = false;
+            }
+
+         Default_Mutex() { locked = false; }
+      private:
+         bool locked;
+      };
+
    return new Default_Mutex;
    }