diff options
| author | Daniel Neus <[email protected]> | 2016-01-08 22:47:00 +0100 |
|---|---|---|
| committer | Daniel Neus <[email protected]> | 2016-01-08 22:47:00 +0100 |
| commit | eeabdef99c06007937c6f6870f1dad8d07edb5ae (patch) | |
| tree | ec2c91e58b446fdcb2bc8c8eae42e830b7e2a32c | |
| parent | 401db82da42117744cede7ce1888d76f98072bcd (diff) | |
don't declare functions noreturn that are maybe implemented in the future
In addition don't declare virtual functions noreturn
| -rw-r--r-- | src/lib/cert/x509/ocsp_types.h | 2 | ||||
| -rw-r--r-- | src/lib/cert/x509/x509_ext.h | 4 | ||||
| -rw-r--r-- | src/lib/tls/credentials_manager.h | 2 | ||||
| -rw-r--r-- | src/lib/utils/http_util/http_util.h | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/src/lib/cert/x509/ocsp_types.h b/src/lib/cert/x509/ocsp_types.h index 233d0793d..42a84c38b 100644 --- a/src/lib/cert/x509/ocsp_types.h +++ b/src/lib/cert/x509/ocsp_types.h @@ -50,7 +50,7 @@ class BOTAN_DLL SingleResponse : public ASN1_Object X509_Time next_update() const { return m_nextupdate; } - void encode_into(class DER_Encoder& to) const override BOTAN_NORETURN; + void encode_into(class DER_Encoder& to) const override; void decode_from(class BER_Decoder& from) override; private: diff --git a/src/lib/cert/x509/x509_ext.h b/src/lib/cert/x509/x509_ext.h index d47409c15..0ce49231a 100644 --- a/src/lib/cert/x509/x509_ext.h +++ b/src/lib/cert/x509/x509_ext.h @@ -361,7 +361,7 @@ class BOTAN_DLL CRL_Distribution_Points : public Certificate_Extension class BOTAN_DLL Distribution_Point : public ASN1_Object { public: - void encode_into(class DER_Encoder&) const override BOTAN_NORETURN; + void encode_into(class DER_Encoder&) const override; void decode_from(class BER_Decoder&) override; const AlternativeName& point() const { return m_point; } @@ -387,7 +387,7 @@ class BOTAN_DLL CRL_Distribution_Points : public Certificate_Extension bool should_encode() const override { return !m_distribution_points.empty(); } - std::vector<byte> encode_inner() const override BOTAN_NORETURN; + std::vector<byte> encode_inner() const override; void decode_inner(const std::vector<byte>&) override; void contents_to(Data_Store&, Data_Store&) const override; diff --git a/src/lib/tls/credentials_manager.h b/src/lib/tls/credentials_manager.h index 23ae863b9..96e840d13 100644 --- a/src/lib/tls/credentials_manager.h +++ b/src/lib/tls/credentials_manager.h @@ -181,7 +181,7 @@ class BOTAN_DLL Credentials_Manager */ virtual SymmetricKey psk(const std::string& type, const std::string& context, - const std::string& identity) BOTAN_NORETURN; + const std::string& identity); }; } diff --git a/src/lib/utils/http_util/http_util.h b/src/lib/utils/http_util/http_util.h index 766ea4f6c..6688285c6 100644 --- a/src/lib/utils/http_util/http_util.h +++ b/src/lib/utils/http_util/http_util.h @@ -64,7 +64,7 @@ std::string BOTAN_DLL http_transact_asio(const std::string& hostname, #endif std::string BOTAN_DLL http_transact_fail(const std::string& hostname, - const std::string& message) BOTAN_NORETURN; + const std::string& message); BOTAN_DLL Response http_sync(http_exch_fn fn, |