diff options
| author | Jack Lloyd <[email protected]> | 2015-12-11 09:42:48 -0500 |
|---|---|---|
| committer | Jack Lloyd <[email protected]> | 2015-12-11 09:42:48 -0500 |
| commit | 272e72d2dcb3e4b3e717946383dc67dba860c473 (patch) | |
| tree | 1ea43bffd5df06218c7bc7774a075d41794ed1ab /src/lib/utils | |
| parent | 6b9a3a534071ef84c121c406559f8fc7ad546104 (diff) | |
Missing adds
Diffstat (limited to 'src/lib/utils')
| -rw-r--r-- | src/lib/utils/dyn_load/dyn_load.cpp | 1 | ||||
| -rw-r--r-- | src/lib/utils/exceptn.h | 4 | ||||
| -rw-r--r-- | src/lib/utils/http_util/http_util.h | 1 | ||||
| -rw-r--r-- | src/lib/utils/parsing.cpp | 1 | ||||
| -rw-r--r-- | src/lib/utils/read_cfg.cpp | 2 | ||||
| -rw-r--r-- | src/lib/utils/sqlite3/sqlite3.cpp | 1 |
6 files changed, 4 insertions, 6 deletions
diff --git a/src/lib/utils/dyn_load/dyn_load.cpp b/src/lib/utils/dyn_load/dyn_load.cpp index 9b99331d1..03bf85090 100644 --- a/src/lib/utils/dyn_load/dyn_load.cpp +++ b/src/lib/utils/dyn_load/dyn_load.cpp @@ -7,7 +7,6 @@ #include <botan/internal/dyn_load.h> #include <botan/build.h> -#include <stdexcept> #if defined(BOTAN_TARGET_OS_HAS_DLOPEN) #include <dlfcn.h> diff --git a/src/lib/utils/exceptn.h b/src/lib/utils/exceptn.h index c9b45f916..7ac32288d 100644 --- a/src/lib/utils/exceptn.h +++ b/src/lib/utils/exceptn.h @@ -11,7 +11,6 @@ #include <botan/types.h> #include <botan/parsing.h> #include <exception> -#include <stdexcept> #include <string> namespace Botan { @@ -24,7 +23,8 @@ class BOTAN_DLL Exception : public std::exception public: Exception(const std::string& what) : m_what(what) {} Exception(const char* prefix, const std::string& what) : m_what(std::string(prefix) + " " + what) {} - const char* what() const override { return m_what.c_str(); } + //const char* what() const override BOTAN_NOEXCEPT { return m_what.c_str(); } + const char* what() const BOTAN_NOEXCEPT override { return m_what.c_str(); } private: std::string m_what; }; diff --git a/src/lib/utils/http_util/http_util.h b/src/lib/utils/http_util/http_util.h index 746b790f1..6688285c6 100644 --- a/src/lib/utils/http_util/http_util.h +++ b/src/lib/utils/http_util/http_util.h @@ -9,6 +9,7 @@ #define BOTAN_UTILS_URLGET_H__ #include <botan/types.h> +#include <botan/exceptn.h> #include <future> #include <vector> #include <map> diff --git a/src/lib/utils/parsing.cpp b/src/lib/utils/parsing.cpp index 179e2e546..2bf41f260 100644 --- a/src/lib/utils/parsing.cpp +++ b/src/lib/utils/parsing.cpp @@ -12,7 +12,6 @@ #include <botan/loadstor.h> #include <limits> #include <set> -#include <stdexcept> namespace Botan { diff --git a/src/lib/utils/read_cfg.cpp b/src/lib/utils/read_cfg.cpp index 0719ee681..1a15f2e63 100644 --- a/src/lib/utils/read_cfg.cpp +++ b/src/lib/utils/read_cfg.cpp @@ -6,7 +6,7 @@ */ #include <botan/parsing.h> -#include <stdexcept> +#include <botan/exceptn.h> namespace Botan { diff --git a/src/lib/utils/sqlite3/sqlite3.cpp b/src/lib/utils/sqlite3/sqlite3.cpp index fde89b91d..1220829dd 100644 --- a/src/lib/utils/sqlite3/sqlite3.cpp +++ b/src/lib/utils/sqlite3/sqlite3.cpp @@ -6,7 +6,6 @@ */ #include <botan/sqlite3.h> -#include <stdexcept> #include <sqlite3.h> namespace Botan { |