The unified diff between revisions [92f17752..] and [48b49b84..] is displayed below. It can also be downloaded as a raw diff.

This diff has been restricted to the following files: 'include/config.h'

#
#
# patch "include/config.h"
#  from [67ea849588c76de31039a5b31d47983ae8ad7159]
#    to [1f8bab46263a80c5eef84f1289b3db99e664f7f5]
#
============================================================
--- include/config.h	67ea849588c76de31039a5b31d47983ae8ad7159
+++ include/config.h	1f8bab46263a80c5eef84f1289b3db99e664f7f5
@@ -1,13 +1,12 @@
 /*************************************************
 * Configuration Handling Header File             *
-* (C) 1999-2006 The Botan Project                *
+* (C) 1999-2007 Jack Lloyd                       *
 *************************************************/

 #ifndef BOTAN_POLICY_CONF_H__
 #define BOTAN_POLICY_CONF_H__

-#include <botan/types.h>
-#include <botan/enums.h>
+#include <botan/mutex.h>
 #include <string>
 #include <vector>
 #include <map>
@@ -17,9 +16,12 @@ namespace Botan {
 /*************************************************
 * Library Configuration Settings                 *
 *************************************************/
-class Config
+class BOTAN_DLL Config
    {
    public:
+      Config();
+      ~Config();
+
       void load_defaults();

       std::string get(const std::string&, const std::string&) const;
@@ -28,10 +30,7 @@ class Config
                const std::string&, bool = true);

       std::string option(const std::string&) const;
-      u32bit option_as_u32bit(const std::string&) const;
       u32bit option_as_time(const std::string&) const;
-      bool option_as_bool(const std::string&) const;
-      std::vector<std::string> option_as_list(const std::string&) const;

       void set_option(const std::string, const std::string&);

@@ -39,17 +38,18 @@ class Config
       std::string deref_alias(const std::string&) const;

       void load_inifile(const std::string&);
+   private:
+      Config(const Config&) {}
+      Config& operator=(const Config&) { return (*this); }

-      static void choose_sig_format(const std::string&, std::string&,
-                                    Signature_Format&);
-   private:
       std::map<std::string, std::string> settings;
+      Mutex* mutex;
    };

 /*************************************************
 * Hook for the global config                     *
 *************************************************/
-Config& global_config();
+BOTAN_DLL Config& global_config();

 }