diff options
author | Hannes Rantzsch <[email protected]> | 2019-04-23 10:19:52 +0200 |
---|---|---|
committer | Hannes Rantzsch <[email protected]> | 2019-04-23 10:19:52 +0200 |
commit | cd10101440fbc45cf11e51cfe21bd0a7a9a25e9e (patch) | |
tree | 7d54a0c3e2cfe09ad8bc0a7a7a2cc0cb1fabba01 /src/lib/tls | |
parent | 26666dd7c8782975accc152b20173a17e7bcf1a6 (diff) |
remove superfluous #ifdef guards
Diffstat (limited to 'src/lib/tls')
-rw-r--r-- | src/lib/tls/asio/asio_async_base.h | 3 | ||||
-rw-r--r-- | src/lib/tls/asio/asio_async_handshake_op.h | 3 | ||||
-rw-r--r-- | src/lib/tls/asio/asio_async_read_op.h | 3 | ||||
-rw-r--r-- | src/lib/tls/asio/asio_async_write_op.h | 3 | ||||
-rw-r--r-- | src/lib/tls/asio/asio_context.h | 3 | ||||
-rw-r--r-- | src/lib/tls/asio/asio_convert_exceptions.h | 3 | ||||
-rw-r--r-- | src/lib/tls/asio/asio_error.h | 3 | ||||
-rw-r--r-- | src/lib/tls/asio/asio_stream.h | 3 | ||||
-rw-r--r-- | src/lib/tls/asio/asio_stream_base.h | 3 | ||||
-rw-r--r-- | src/lib/tls/asio/asio_stream_core.h | 3 |
10 files changed, 0 insertions, 30 deletions
diff --git a/src/lib/tls/asio/asio_async_base.h b/src/lib/tls/asio/asio_async_base.h index 6e344ec9b..9e559f249 100644 --- a/src/lib/tls/asio/asio_async_base.h +++ b/src/lib/tls/asio/asio_async_base.h @@ -11,8 +11,6 @@ #include <botan/build.h> -#if defined(BOTAN_HAS_TLS) && defined(BOTAN_HAS_BOOST_ASIO) - #include <boost/version.hpp> #if BOOST_VERSION >= 106600 @@ -107,5 +105,4 @@ struct AsyncBase : boost::asio::coroutine } // namespace Botan #endif // BOOST_VERSION -#endif // BOTAN_HAS_TLS && BOTAN_HAS_BOOST_ASIO #endif // BOTAN_ASIO_ASYNC_BASE_H_ diff --git a/src/lib/tls/asio/asio_async_handshake_op.h b/src/lib/tls/asio/asio_async_handshake_op.h index f3949a404..92a9de7da 100644 --- a/src/lib/tls/asio/asio_async_handshake_op.h +++ b/src/lib/tls/asio/asio_async_handshake_op.h @@ -11,8 +11,6 @@ #include <botan/build.h> -#if defined(BOTAN_HAS_TLS) && defined(BOTAN_HAS_BOOST_ASIO) - #include <boost/version.hpp> #if BOOST_VERSION >= 106600 @@ -123,5 +121,4 @@ struct AsyncHandshakeOperation : public AsyncBase<Handler, typename Stream::exec #include <boost/asio/unyield.hpp> #endif // BOOST_VERSION -#endif // BOTAN_HAS_TLS && BOTAN_HAS_BOOST_ASIO #endif // BOTAN_ASIO_ASYNC_HANDSHAKE_OP_H_ diff --git a/src/lib/tls/asio/asio_async_read_op.h b/src/lib/tls/asio/asio_async_read_op.h index dc963d786..5457a73ac 100644 --- a/src/lib/tls/asio/asio_async_read_op.h +++ b/src/lib/tls/asio/asio_async_read_op.h @@ -11,8 +11,6 @@ #include <botan/build.h> -#if defined(BOTAN_HAS_TLS) && defined(BOTAN_HAS_BOOST_ASIO) - #include <boost/version.hpp> #if BOOST_VERSION >= 106600 @@ -119,5 +117,4 @@ struct AsyncReadOperation : public AsyncBase<Handler, typename Stream::executor_ #include <boost/asio/unyield.hpp> #endif // BOOST_VERSION -#endif // BOTAN_HAS_TLS && BOTAN_HAS_BOOST_ASIO #endif // BOTAN_ASIO_ASYNC_READ_OP_H_ diff --git a/src/lib/tls/asio/asio_async_write_op.h b/src/lib/tls/asio/asio_async_write_op.h index cec145ebe..df34958e0 100644 --- a/src/lib/tls/asio/asio_async_write_op.h +++ b/src/lib/tls/asio/asio_async_write_op.h @@ -11,8 +11,6 @@ #include <botan/build.h> -#if defined(BOTAN_HAS_TLS) && defined(BOTAN_HAS_BOOST_ASIO) - #include <boost/version.hpp> #if BOOST_VERSION >= 106600 @@ -103,5 +101,4 @@ struct AsyncWriteOperation : public AsyncBase<Handler, typename Stream::executor #include <boost/asio/unyield.hpp> #endif // BOOST_VERSION -#endif // BOTAN_HAS_TLS && BOTAN_HAS_BOOST_ASIO #endif // BOTAN_ASIO_ASYNC_WRITE_OP_H_ diff --git a/src/lib/tls/asio/asio_context.h b/src/lib/tls/asio/asio_context.h index dec2f7408..7de88ebce 100644 --- a/src/lib/tls/asio/asio_context.h +++ b/src/lib/tls/asio/asio_context.h @@ -11,8 +11,6 @@ #include <botan/build.h> -#if defined(BOTAN_HAS_TLS) && defined(BOTAN_HAS_BOOST_ASIO) - #include <boost/version.hpp> #if BOOST_VERSION >= 106600 @@ -38,5 +36,4 @@ struct Context } // namespace Botan #endif // BOOST_VERSION -#endif // BOTAN_HAS_TLS && BOTAN_HAS_BOOST_ASIO #endif // BOTAN_ASIO_TLS_CONTEXT_H_ diff --git a/src/lib/tls/asio/asio_convert_exceptions.h b/src/lib/tls/asio/asio_convert_exceptions.h index 57d4d2dd3..305726c04 100644 --- a/src/lib/tls/asio/asio_convert_exceptions.h +++ b/src/lib/tls/asio/asio_convert_exceptions.h @@ -11,8 +11,6 @@ #include <botan/build.h> -#if defined(BOTAN_HAS_TLS) && defined(BOTAN_HAS_BOOST_ASIO) - #include <boost/version.hpp> #if BOOST_VERSION >= 106600 @@ -136,5 +134,4 @@ inline boost::system::error_code convertException() } // namespace Botan #endif // BOOST_VERSION -#endif // BOTAN_HAS_TLS && BOTAN_HAS_BOOST_ASIO #endif // BOTAN_ASIO_CONVERT_EXCEPTIONS_H_ diff --git a/src/lib/tls/asio/asio_error.h b/src/lib/tls/asio/asio_error.h index ecf3e8683..97b19395e 100644 --- a/src/lib/tls/asio/asio_error.h +++ b/src/lib/tls/asio/asio_error.h @@ -11,8 +11,6 @@ #include <botan/build.h> -#if defined(BOTAN_HAS_TLS) && defined(BOTAN_HAS_BOOST_ASIO) - #include <boost/version.hpp> #if BOOST_VERSION >= 106600 @@ -172,5 +170,4 @@ template<> struct is_error_code_enum<Botan::TLS::error> } // namespace boost #endif // BOOST_VERSION -#endif // BOTAN_HAS_TLS && BOTAN_HAS_BOOST_ASIO #endif // BOTAN_ASIO_ERROR_H_ diff --git a/src/lib/tls/asio/asio_stream.h b/src/lib/tls/asio/asio_stream.h index 4a30ea421..c3666a085 100644 --- a/src/lib/tls/asio/asio_stream.h +++ b/src/lib/tls/asio/asio_stream.h @@ -11,8 +11,6 @@ #include <botan/build.h> -#if defined(BOTAN_HAS_TLS) && defined(BOTAN_HAS_BOOST_ASIO) - // first version to be compatible with Networking TS (N4656) and boost::beast #include <boost/version.hpp> #if BOOST_VERSION >= 106600 @@ -579,5 +577,4 @@ class Stream : public StreamBase<Channel> } // namespace Botan #endif // BOOST_VERSION -#endif // BOTAN_HAS_TLS && BOTAN_HAS_BOOST_ASIO #endif // BOTAN_ASIO_STREAM_H_ diff --git a/src/lib/tls/asio/asio_stream_base.h b/src/lib/tls/asio/asio_stream_base.h index 9164df02d..169d035a3 100644 --- a/src/lib/tls/asio/asio_stream_base.h +++ b/src/lib/tls/asio/asio_stream_base.h @@ -11,8 +11,6 @@ #include <botan/build.h> -#if defined(BOTAN_HAS_TLS) && defined(BOTAN_HAS_BOOST_ASIO) - #include <boost/version.hpp> #if BOOST_VERSION >= 106600 @@ -94,5 +92,4 @@ class StreamBase<Botan::TLS::Client> } // namespace Botan #endif // BOOST_VERSION -#endif // BOTAN_HAS_TLS && BOTAN_HAS_BOOST_ASIO #endif // BOTAN_ASIO_STREAM_BASE_H_ diff --git a/src/lib/tls/asio/asio_stream_core.h b/src/lib/tls/asio/asio_stream_core.h index e15632152..00369ad86 100644 --- a/src/lib/tls/asio/asio_stream_core.h +++ b/src/lib/tls/asio/asio_stream_core.h @@ -11,8 +11,6 @@ #include <botan/build.h> -#if defined(BOTAN_HAS_TLS) && defined(BOTAN_HAS_BOOST_ASIO) - #include <boost/version.hpp> #if BOOST_VERSION >= 106600 @@ -122,5 +120,4 @@ struct StreamCore : public Botan::TLS::Callbacks } // namespace Botan #endif // BOOST_VERSION -#endif // BOTAN_HAS_TLS && BOTAN_HAS_BOOST_ASIO #endif // BOTAN_ASIO_STREAM_CORE_H_ |