]> git.ipfire.org Git - thirdparty/kea.git/commitdiff
[5449] Spit has_feature #if
authorFrancis Dupont <fdupont@isc.org>
Thu, 21 Dec 2017 15:29:24 +0000 (16:29 +0100)
committerFrancis Dupont <fdupont@isc.org>
Thu, 21 Dec 2017 15:29:24 +0000 (16:29 +0100)
src/lib/cryptolink/openssl_common.h

index 6011f7e6c808626fea46cb0e4f3bfdaeca3f4f59..7e47e698f541855e17f3ef330941472a3692d24b 100644 (file)
@@ -37,9 +37,11 @@ public:
     SecBuf(const std::vector<T>& x) : vec_(x) {}
 
     ~SecBuf() {
-#if defined(__has_feature) && __has_feature(address_sanitizer)
+#if defined(__has_feature)
+#if __has_feature(address_sanitizer)
         // Make the address sanitizer happy assuming this won't reallocate
         vec_.resize(vec_.capacity());
+#endif
 #endif
         std::memset(&vec_[0], 0, vec_.capacity() * sizeof(T));
     };
@@ -69,9 +71,11 @@ public:
     };
 
     void clear() {
-#if defined(__has_feature) && __has_feature(address_sanitizer)
+#if defined(__has_feature)
+#if __has_feature(address_sanitizer)
         // Make the address sanitizer happy assuming this won't reallocate
         vec_.resize(vec_.capacity());
+#endif
 #endif
         std::memset(&vec_[0], 0, vec_.capacity() * sizeof(T));
         vec_.clear();