From a6d79e8468b6c516745002876bbe52f3963031a3 Mon Sep 17 00:00:00 2001 From: Luca Weiss Date: Sun, 4 Apr 2021 13:13:24 +0200 Subject: Move glib includes outside of extern "C" Recent glib versions throw this error otherwise: In file included from /usr/include/glib-2.0/glib/gatomic.h:31, from /usr/include/glib-2.0/glib/gthread.h:32, from /usr/include/glib-2.0/glib/gasyncqueue.h:32, from /usr/include/glib-2.0/glib.h:32, from /home/pmos/build/src/qmenumodel-0.8.0/libqmenumodel/src/converter.cpp:22: /usr/include/c++/10.2.1/type_traits:56:3: error: template with C linkage 56 | template | ^~~~~~~~ /home/pmos/build/src/qmenumodel-0.8.0/libqmenumodel/src/converter.cpp:21:1: note: 'extern "C"' linkage started here 21 | extern "C" { | ^~~~~~~~~~ --- tests/client/treetest.cpp | 2 -- 1 file changed, 2 deletions(-) (limited to 'tests/client/treetest.cpp') diff --git a/tests/client/treetest.cpp b/tests/client/treetest.cpp index 3c2827b..baa1554 100644 --- a/tests/client/treetest.cpp +++ b/tests/client/treetest.cpp @@ -20,9 +20,7 @@ #include "qmenumodel.h" -extern "C" { #include -} #include -- cgit v1.2.3