From 562fee9d09d25cfd3d7c60ca997f719fd9985b63 Mon Sep 17 00:00:00 2001 From: Kp Date: Thu, 10 Nov 2022 02:04:09 +0000 Subject: [PATCH] Use `#if` for DXX_HAVE_CXX_BUILTIN_FILE_LINE --- SConstruct | 6 +++--- common/include/fwd-valptridx.h | 2 +- common/main/d_srcloc.h | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/SConstruct b/SConstruct index a37a9531f..26618bba5 100644 --- a/SConstruct +++ b/SConstruct @@ -1835,12 +1835,12 @@ return __builtin_expect(argc == 1, 1) ? 1 : 0; @_custom_test def check_builtin_file(self,context): - if self.Compile(context, text=''' + context.sconf.Define('DXX_HAVE_CXX_BUILTIN_FILE_LINE', + self.Compile(context, text=''' static void f(const char * = __builtin_FILE(), unsigned = __builtin_LINE()) { } -''', main='f();', msg='whether compiler accepts __builtin_FILE, __builtin_LINE'): - context.sconf.Define('DXX_HAVE_CXX_BUILTIN_FILE_LINE') +''', main='f();', msg='whether compiler accepts __builtin_FILE, __builtin_LINE')) @_custom_test def check_builtin_object_size(self,context): diff --git a/common/include/fwd-valptridx.h b/common/include/fwd-valptridx.h index 83263de1b..402d33a7c 100644 --- a/common/include/fwd-valptridx.h +++ b/common/include/fwd-valptridx.h @@ -13,7 +13,7 @@ #include "cpp-valptridx.h" #include "d_array.h" -#if defined(DXX_HAVE_CXX_BUILTIN_FILE_LINE) +#if DXX_HAVE_CXX_BUILTIN_FILE_LINE #define DXX_VALPTRIDX_ENABLE_REPORT_FILENAME #define DXX_VALPTRIDX_REPORT_STANDARD_LEADER_COMMA_N_DECL_VARS const char *filename = __builtin_FILE(), const unsigned lineno = __builtin_LINE() #define DXX_VALPTRIDX_REPORT_STANDARD_LEADER_COMMA_L_DECL_VARS , DXX_VALPTRIDX_REPORT_STANDARD_LEADER_COMMA_N_DECL_VARS diff --git a/common/main/d_srcloc.h b/common/main/d_srcloc.h index c9eb434fe..35f4d9e3c 100644 --- a/common/main/d_srcloc.h +++ b/common/main/d_srcloc.h @@ -44,7 +44,7 @@ public: } }; -#ifdef DXX_HAVE_CXX_BUILTIN_FILE_LINE +#if DXX_HAVE_CXX_BUILTIN_FILE_LINE #include template <> @@ -97,7 +97,7 @@ public: /* Allow callers to pass explicit file/line, for signature * compatibility with `location_value_wrapper`. */ -#ifndef DXX_HAVE_CXX_BUILTIN_FILE_LINE +#if !DXX_HAVE_CXX_BUILTIN_FILE_LINE location_value_wrapper(const T &v) : value(v) { @@ -105,11 +105,11 @@ public: #endif location_value_wrapper(const T &v, const char *const f -#ifdef DXX_HAVE_CXX_BUILTIN_FILE_LINE +#if DXX_HAVE_CXX_BUILTIN_FILE_LINE = __builtin_FILE() #endif , const unsigned l -#ifdef DXX_HAVE_CXX_BUILTIN_FILE_LINE +#if DXX_HAVE_CXX_BUILTIN_FILE_LINE = __builtin_LINE() #endif ) :