luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-08-04 00:13:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'atomic-older-cplusplus' into 'main'

Browse Source 
gatomic: fix the atomic compare_and_exchange macros on older C++ standard versions

See merge request GNOME/glib!2864
This commit is contained in:
Philip Withnall
2022-10-12 09:56:19 +00:00
parent 90ae06a9f6 9b6cc47bcb
commit e90733a457
8 changed files with 110 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
gio/tests/meson.build
View File

@@ -27,6 +27,8 @@ if cc.has_header('pty.h')
endif
endif
test_cpp_args = test_c_args
if host_machine.system() == 'windows'
common_gio_tests_deps += [iphlpapi_dep, winsock2, cc.find_library ('secur32')]
endif
@@ -130,8 +132,19 @@ if have_cxx
gio_tests += {
'cxx' : {
'source' : ['cxx.cpp'],
'suite': ['C++'],
},
}
foreach std, arg: cxx_standards
gio_tests += {
'cxx-@0@'.format(std) : {
'source' : ['cxx.cpp'],
'suite' : ['cpp'],
'cpp_args' : [arg],
},
}
endforeach
endif
test_extra_programs = {
@@ -882,6 +895,7 @@ foreach test_name, extra_args : gio_tests
exe = executable(test_name, [source, extra_sources],
c_args : test_c_args + extra_args.get('c_args', []),
cpp_args : test_cpp_args + extra_args.get('cpp_args', []),
dependencies : common_gio_tests_deps + extra_args.get('dependencies', []),
install_rpath : extra_args.get('install_rpath', ''),
install_dir: installed_tests_execdir,