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

Change check_size_type_format_modifier to use ''.format

Browse source
This commit is contained in:
Kp 2022-10-23 23:00:24 +00:00
parent ee4268bf9f
commit 4506d0f6f3
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
SConstruct
View file

@ -2357,15 +2357,15 @@ help:always wipe certain freed memory
implicit_tests.append(_implicit_test.RecordedTest('check_size_type_I64', "assume size_t is formatted as `unsigned I64`")) implicit_tests.append(_implicit_test.RecordedTest('check_size_type_I64', "assume size_t is formatted as `unsigned I64`"))
@_custom_test @_custom_test
def _check_size_type_format_modifier(self,context,_text=''' def _check_size_type_format_modifier(self,context,_text_format='''
#include <cstddef> #include <cstddef>
#define DXX_PRI_size_type %s #define DXX_PRI_size_type {}
__attribute_format_printf(1, 2) __attribute_format_printf(1, 2)
void f(const char *, ...); void f(const char *, ...);
void f(const char *, ...) void f(const char *, ...)
{ {{
} }}
''',_main=''' '''.format,_main='''
std::size_t s = 0; std::size_t s = 0;
f("%" DXX_PRI_size_type, s); f("%" DXX_PRI_size_type, s);
'''): '''):
@ -2445,8 +2445,8 @@ $ x86_64-pc-linux-gnu-g++-5.4.0 -x c++ -S -Wformat -o /dev/null -
# Win32 # Win32
('', 'size_type_int'), ('', 'size_type_int'),
): ):
f = '"%su"' % DXX_PRI_size_type f = '"{}u"'.format(DXX_PRI_size_type)
if self.Compile(context, text=_text % f, main=_main, msg='whether to format std::size_t with "%%%su"' % DXX_PRI_size_type, calling_function=calling_function): if self.Compile(context, text=_text_format(f), main=_main, msg='whether to format std::size_t with "%{}u"'.format(DXX_PRI_size_type), calling_function=calling_function):
context.sconf.Define('DXX_PRI_size_type', f) context.sconf.Define('DXX_PRI_size_type', f)
return return
raise SCons.Errors.StopError("C++ compiler rejects all candidate format strings for std::size_t.") raise SCons.Errors.StopError("C++ compiler rejects all candidate format strings for std::size_t.")