[lmi-commits] [lmi] master 21706da 25/28: Fix expression_template_0_test compilation with clang 12

[Greg Chicares]

branch: master
commit 21706da8ae3f9a8e88a559b185e360377d5030b8
Author: Vadim Zeitlin <vadim@tt-solutions.com>
Commit: Gregory W. Chicares <gchicares@sbcglobal.net>

    Fix expression_template_0_test compilation with clang 12
    
    Predefine _LIBCPP_ENABLE_CXX20_REMOVED_ALLOCATOR_MEMBERS for this test
    to explicitly request std::allocator members removed in C++20, as uBLAS
    headers used in it require them.
    
    This should be removed if/when we update to a newer uBLAS version or
    stop using it.
---
 Makefile.am | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Makefile.am b/Makefile.am
index c52d6b6..4b5f1e6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -706,6 +706,10 @@ dbo_rules_test_LDADD = \
 et_vector_test_LDADD = \
   libtest_common.la
 
+# This test uses uBLAS which requires std::allocator members removed in C++20,
+# so ask to explicitly re-enable them when using libc++ (defining this symbol
+# should be harmless otherwise, so don't bother making it conditional).
+expression_template_0_test_CXXFLAGS = $(AM_CXXFLAGS) 
-D_LIBCPP_ENABLE_CXX20_REMOVED_ALLOCATOR_MEMBERS
 expression_template_0_test_LDADD = \
   libtest_common.la