aboutsummaryrefslogtreecommitdiffstats
path: root/src/lib/prov
diff options
context:
space:
mode:
authorJack Lloyd <[email protected]>2018-09-10 19:19:19 -0400
committerJack Lloyd <[email protected]>2018-10-01 12:53:53 -0400
commit8eb900731da945d276f723534af09592213ee582 (patch)
treed080c6fd2ca760796b522d21288b0b4bfc0b6e65 /src/lib/prov
parenta792728e8941b62761052f5e0d288ba13a016c77 (diff)
Remove support for Visual C++ 2013
Closes GH #1557
Diffstat (limited to 'src/lib/prov')
-rw-r--r--src/lib/prov/pkcs11/p11_module.cpp2
-rw-r--r--src/lib/prov/pkcs11/p11_module.h2
-rw-r--r--src/lib/prov/pkcs11/p11_object.cpp2
-rw-r--r--src/lib/prov/pkcs11/p11_object.h2
-rw-r--r--src/lib/prov/pkcs11/p11_session.cpp2
-rw-r--r--src/lib/prov/pkcs11/p11_session.h2
6 files changed, 6 insertions, 6 deletions
diff --git a/src/lib/prov/pkcs11/p11_module.cpp b/src/lib/prov/pkcs11/p11_module.cpp
index ba8b659b9..9399aea28 100644
--- a/src/lib/prov/pkcs11/p11_module.cpp
+++ b/src/lib/prov/pkcs11/p11_module.cpp
@@ -18,7 +18,7 @@ Module::Module(const std::string& file_path, C_InitializeArgs init_args)
reload(init_args);
}
-Module::~Module() BOTAN_NOEXCEPT
+Module::~Module() noexcept
{
try
{
diff --git a/src/lib/prov/pkcs11/p11_module.h b/src/lib/prov/pkcs11/p11_module.h
index fd6384fa6..eb173c1f4 100644
--- a/src/lib/prov/pkcs11/p11_module.h
+++ b/src/lib/prov/pkcs11/p11_module.h
@@ -45,7 +45,7 @@ class BOTAN_PUBLIC_API(2,0) Module final
Module& operator=(const Module& other) = delete;
/// Calls C_Finalize()
- ~Module() BOTAN_NOEXCEPT;
+ ~Module() noexcept;
/**
* Reloads the module and reinitializes it
diff --git a/src/lib/prov/pkcs11/p11_object.cpp b/src/lib/prov/pkcs11/p11_object.cpp
index 5f078fd31..5affa43b3 100644
--- a/src/lib/prov/pkcs11/p11_object.cpp
+++ b/src/lib/prov/pkcs11/p11_object.cpp
@@ -90,7 +90,7 @@ ObjectFinder::ObjectFinder(Session& session, const std::vector<Attribute>& searc
search_template.size());
}
-ObjectFinder::~ObjectFinder() BOTAN_NOEXCEPT
+ObjectFinder::~ObjectFinder() noexcept
{
try
{
diff --git a/src/lib/prov/pkcs11/p11_object.h b/src/lib/prov/pkcs11/p11_object.h
index e6e3200bc..4cacdbfa7 100644
--- a/src/lib/prov/pkcs11/p11_object.h
+++ b/src/lib/prov/pkcs11/p11_object.h
@@ -149,7 +149,7 @@ class BOTAN_PUBLIC_API(2,0) ObjectFinder final
#endif
/// Terminates a search for token and session objects (calls C_FindObjectsFinal)
- ~ObjectFinder() BOTAN_NOEXCEPT;
+ ~ObjectFinder() noexcept;
/**
* Starts or continues a search for token and session objects that match a template, obtaining additional object handles (calls C_FindObjects)
diff --git a/src/lib/prov/pkcs11/p11_session.cpp b/src/lib/prov/pkcs11/p11_session.cpp
index 71397eea5..b0120a2ac 100644
--- a/src/lib/prov/pkcs11/p11_session.cpp
+++ b/src/lib/prov/pkcs11/p11_session.cpp
@@ -36,7 +36,7 @@ Session::Session(Slot& slot, SessionHandle handle)
}
}
-Session::~Session() BOTAN_NOEXCEPT
+Session::~Session() noexcept
{
try
{
diff --git a/src/lib/prov/pkcs11/p11_session.h b/src/lib/prov/pkcs11/p11_session.h
index 8b32063e3..c94818cb9 100644
--- a/src/lib/prov/pkcs11/p11_session.h
+++ b/src/lib/prov/pkcs11/p11_session.h
@@ -50,7 +50,7 @@ class BOTAN_PUBLIC_API(2,0) Session final
Session& operator=(const Session& other) = delete;
/// Logout user and close the session on destruction
- ~Session() BOTAN_NOEXCEPT;
+ ~Session() noexcept;
/// @return a reference to the slot
inline const Slot& slot() const