Move InitializerOptions out of the Init namespace

Alter the initialization functions to take an InitializerOptions object
instead of a std::string

1 files changed, 12 insertions, 11 deletions

diff --git a/include/init.h b/include/init.h
index 7104df49c..f00f97f9e 100644
--- a/include/init.h
+++ b/include/init.h
@@ -11,8 +11,6 @@
 
 namespace Botan {
 
-namespace Init {
-
 /*************************************************
 * Options for initializing the library           *
 *************************************************/
@@ -31,23 +29,26 @@ class InitializerOptions
    };
 
 /*************************************************
-* Main Library Initialization/Shutdown Functions *
-*************************************************/
-void initialize(const std::string& = "");
-void deinitialize();
-
-}
-
-/*************************************************
 * Library Initialization/Shutdown Object         *
 *************************************************/
 class LibraryInitializer
    {
    public:
-      LibraryInitializer(const std::string& = "");
+      LibraryInitializer(const InitializerOptions&);
       ~LibraryInitializer();
    };
 
+namespace Init {
+
+/*************************************************
+* Main Library Initialization/Shutdown Functions *
+*************************************************/
+void initialize(const InitializerOptions&);
+void deinitialize();
+
+}
+
+
 }
 
 #endif