[glib: 7/7] Merge branch 'atomic-older-cplusplus' into 'main'
- From: Philip Withnall <pwithnall src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glib: 7/7] Merge branch 'atomic-older-cplusplus' into 'main'
- Date: Wed, 12 Oct 2022 09:56:27 +0000 (UTC)
commit e90733a4576ed8e44546f8409027000dbcc6aaf7
Merge: 90ae06a9f6 9b6cc47bcb
Author: Philip Withnall <philip tecnocode co uk>
Date: Wed Oct 12 09:56:19 2022 +0000
Merge branch 'atomic-older-cplusplus' into 'main'
gatomic: fix the atomic compare_and_exchange macros on older C++ standard versions
See merge request GNOME/glib!2864
gio/tests/meson.build | 14 ++++++++++
glib/gatomic.h | 8 +++---
glib/glib-typeof.h | 7 +++--
glib/tests/cxx.cpp | 70 +++++++++++++++++++++++++++--------------------
glib/tests/meson.build | 13 +++++++++
gmodule/tests/meson.build | 13 +++++++++
gobject/tests/meson.build | 13 +++++++++
meson.build | 8 ++++++
8 files changed, 110 insertions(+), 36 deletions(-)
---
diff --cc gobject/tests/meson.build
index d0fa605679,94eae7527e..72e718b3de
--- a/gobject/tests/meson.build
+++ b/gobject/tests/meson.build
@@@ -146,9 -157,9 +158,10 @@@ foreach test_name, extra_args : gobject
exe = executable(test_name, source,
c_args : test_cargs + extra_args.get('c_args', []),
+ cpp_args : test_cpp_args + extra_args.get('cpp_args', []),
dependencies : test_deps + extra_args.get('dependencies', []),
install_dir: installed_tests_execdir,
+ install_tag: 'tests',
install: install,
)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]