TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Use #if for DXX_HAVE_CXX_BUILTIN_FILE_LINE

Browse source
This commit is contained in:
Kp 2022-11-10 02:04:09 +00:00
parent e07c5af1d0
commit 562fee9d09
3 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
SConstruct
View file

@ -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):

2
common/include/fwd-valptridx.h
View file

@ -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

8
common/main/d_srcloc.h
View file

@ -44,7 +44,7 @@ public:
}
};
#ifdef DXX_HAVE_CXX_BUILTIN_FILE_LINE
#if DXX_HAVE_CXX_BUILTIN_FILE_LINE
#include <cstdio>
template <>
@ -97,7 +97,7 @@ public:
/* Allow callers to pass explicit file/line, for signature
* compatibility with `location_value_wrapper<T, true>`.
*/
#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
) :