diff options
| author | Luca Weiss <luca@z3ntu.xyz> | 2021-04-04 13:13:24 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2021-05-17 21:41:37 +0200 |
| commit | a6d79e8468b6c516745002876bbe52f3963031a3 (patch) | |
| tree | c31075bb7c901ec0da98082e85d1f74e67c23e10 /libqmenumodel/src/unitymenumodelevents.cpp | |
| parent | 792a56d5e67ac9bc0d4f57592507c709cb6d20a1 (diff) | |
| download | qmenumodel-a6d79e8468b6c516745002876bbe52f3963031a3.tar.gz qmenumodel-a6d79e8468b6c516745002876bbe52f3963031a3.tar.bz2 qmenumodel-a6d79e8468b6c516745002876bbe52f3963031a3.zip | |
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<typename _Tp, _Tp __v>
| ^~~~~~~~
/home/pmos/build/src/qmenumodel-0.8.0/libqmenumodel/src/converter.cpp:21:1: note: 'extern "C"' linkage started here
21 | extern "C" {
| ^~~~~~~~~~
Diffstat (limited to 'libqmenumodel/src/unitymenumodelevents.cpp')
| -rw-r--r-- | libqmenumodel/src/unitymenumodelevents.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/libqmenumodel/src/unitymenumodelevents.cpp b/libqmenumodel/src/unitymenumodelevents.cpp index 68dacde..46a9517 100644 --- a/libqmenumodel/src/unitymenumodelevents.cpp +++ b/libqmenumodel/src/unitymenumodelevents.cpp @@ -17,10 +17,8 @@ * Nicholas Dedekind <nick.dedekind@canonical.com */ -extern "C" { #include <glib-object.h> #include <gio/gio.h> -} #include "unitymenumodelevents.h" #include "unitymenumodel.h" |