Merge remote-tracking branch 'origin/10.0'

Change-Id: Iff4973fc4116122bcaa7aa9434294dba875ef56a
2023-02-14 13:08:27 +02:00
parent 6383146b0e b4f665f8ac
commit 6a0a4ac5e4
303 changed files with 5518 additions and 6428 deletions
--- a/src/libs/cplusplus/pp-engine.cpp
+++ b/src/libs/cplusplus/pp-engine.cpp
@@ -203,7 +203,7 @@ struct Value
    inline bool is_zero () const
    { return l == 0; }

-    template<typename T> static bool cmpImpl(T v1, T v2)
+    template<typename T> static int cmpImpl(T v1, T v2)
    {
        if (v1 < v2)
            return -1;