From 8bb53bbed281ac55b20ece644b937f04dbb717f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ion=20Gazta=C3=B1aga?= <igaztanaga@gmail.com>
Date: Tue, 4 Jan 2022 16:42:43 +0100
Subject: [PATCH] Make test_span_conversion() test a bit more clear

---
 test/vector_test.cpp | 29 +++++++++++++++++------------
 1 file changed, 17 insertions(+), 12 deletions(-)

diff --git a/test/vector_test.cpp b/test/vector_test.cpp
index 8a5f37f..cd8aa09 100644
--- a/test/vector_test.cpp
+++ b/test/vector_test.cpp
@@ -197,24 +197,29 @@ bool test_merge_empty_free()
    return !empty.get_stored_allocator().deallocate_called_without_allocate_;
 }
 
-#ifdef __cpp_lib_span
-#include <span>
+#if defined(__cpp_lib_span)
+#     define BOOST_VECTOR_TEST_HAS_SPAN
 #endif
 
+#ifdef BOOST_VECTOR_TEST_HAS_SPAN
+#include <span>
+
 bool test_span_conversion()
 {
-   #ifdef __cpp_lib_span
-   {
-      boost::container::vector myVec{1, 2, 3, 4, 5};
-      std::span mySpan1{myVec};                                        // (1)
-      std::span mySpan2{myVec.data(), myVec.size()};                   // (2)
-      return mySpan1.size() == myVec.size() && mySpan1.size() == mySpan2.size();
-   }
-   #else
-   return true;
-   #endif
+   boost::container::vector myVec{1, 2, 3, 4, 5};
+   std::span mySpan1{myVec};                                        // (1)
+   std::span mySpan2{myVec.data(), myVec.size()};                   // (2)
+   return mySpan1.size() == myVec.size() && mySpan1.size() == mySpan2.size();
 }
 
+#else //BOOST_VECTOR_TEST_HAS_SPAN
+bool test_span_conversion()
+{
+   return true;
+}
+
+#endif   //BOOST_VECTOR_TEST_HAS_SPAN
+
 int main()
 {
    {