From: Alexander A. Klimov <alexander.klimov@icinga.com>
Date: Tue, 12 Mar 2019 10:47:53 +0000 (+0100)
Subject: UnbufferedAsioTlsStream: don't rely on *this in decltype()s for methods' return types
X-Git-Tag: v2.11.0-rc1~174^2~9
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bf23e5392b1f26aefccb7667797834e8a0759f7e;p=icinga2

UnbufferedAsioTlsStream: don't rely on *this in decltype()s for methods' return types
---

diff --git a/lib/base/tlsstream.hpp b/lib/base/tlsstream.hpp
index 5f5fc6d73..6156a3d2f 100644
--- a/lib/base/tlsstream.hpp
+++ b/lib/base/tlsstream.hpp
@@ -122,7 +122,7 @@ public:
 
 	template<class... Args>
 	inline
-	auto async_handshake(handshake_type type, Args&&... args) -> decltype(AsioTcpTlsStream::async_handshake(type, std::forward<Args>(args)...))
+	auto async_handshake(handshake_type type, Args&&... args) -> decltype(((AsioTcpTlsStream*)nullptr)->async_handshake(type, std::forward<Args>(args)...))
 	{
 		BeforeHandshake(type);
 
@@ -131,7 +131,7 @@ public:
 
 	template<class... Args>
 	inline
-	auto handshake(handshake_type type, Args&&... args) -> decltype(AsioTcpTlsStream::handshake(type, std::forward<Args>(args)...))
+	auto handshake(handshake_type type, Args&&... args) -> decltype(((AsioTcpTlsStream*)nullptr)->handshake(type, std::forward<Args>(args)...))
 	{
 		BeforeHandshake(type);