SHA256
1
0
forked from pool/cppcheck

Accepting request 896668 from devel:tools

OBS-URL: https://build.opensuse.org/request/show/896668
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/cppcheck?expand=0&rev=17
This commit is contained in:
Dominique Leuenberger 2021-06-02 20:11:37 +00:00 committed by Git OBS Bridge
commit e21f14ad8c
4 changed files with 83 additions and 0 deletions

View File

@ -0,0 +1,30 @@
From 19889ea3957b5c59369b3ba2a24273d5c316a531 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20St=C3=B6ggl?= <c72578@yahoo.de>
Date: Sat, 19 Dec 2020 20:47:55 +0100
Subject: [PATCH] Fix gcc11 build errors
- Include required header file <limits>
- Fixes the following errors when compiling with GCC 11:
lib/programmemory.cpp:477:44: error: 'numeric_limits' is not a member
of 'std'
test/testsymboldatabase.cpp:5978:18: error: 'numeric_limits' is not a
member of 'std'
---
lib/programmemory.cpp | 1 +
1 file changed, 1 insertion(+)
diff --git a/lib/programmemory.cpp b/lib/programmemory.cpp
index 440dd22..5bc55f0 100644
--- a/lib/programmemory.cpp
+++ b/lib/programmemory.cpp
@@ -6,6 +6,7 @@
#include "token.h"
#include <algorithm>
#include <cassert>
+#include <limits>
#include <cstdio>
#include <limits>
#include <memory>
--
2.31.1

View File

@ -0,0 +1,43 @@
From 1203306c3e76212a73794c9744b974a1a22e0c23 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomasz=20K=C5=82oczko?=
<31284574+kloczek@users.noreply.github.com>
Date: Mon, 22 Mar 2021 17:43:08 +0000
Subject: [PATCH 1/2] Another gcc11 fix (#3179)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
/home/tkloczko/rpmbuild/BUILD/cppcheck-2.4/lib/symboldatabase.cpp: In member function void SymbolDatabase::createSymbolDatabaseExprIds():
/home/tkloczko/rpmbuild/BUILD/cppcheck-2.4/lib/symboldatabase.cpp:1443:32: error: numeric_limits is not a member of std
1443 | if (id == std::numeric_limits<nonneg int>::max()) {
| ^~~~~~~~~~~~~~
/home/tkloczko/rpmbuild/BUILD/cppcheck-2.4/lib/symboldatabase.cpp:1443:54: error: expected primary-expression before int
1443 | if (id == std::numeric_limits<nonneg int>::max()) {
| ^~~
/home/tkloczko/rpmbuild/BUILD/cppcheck-2.4/lib/symboldatabase.cpp:1443:47: error: expected ) before int
1443 | if (id == std::numeric_limits<nonneg int>::max()) {
| ~ ^ ~~~
| )
This patch adds missing `include #include <limits>`
Co-authored-by: Your Name <you@example.com>
---
lib/symboldatabase.cpp | 1 +
1 file changed, 1 insertion(+)
diff --git a/lib/symboldatabase.cpp b/lib/symboldatabase.cpp
index d597892..3604d51 100644
--- a/lib/symboldatabase.cpp
+++ b/lib/symboldatabase.cpp
@@ -35,6 +35,7 @@
#include <cassert>
#include <climits>
#include <cstring>
+#include <limits>
#include <iomanip>
#include <iostream>
#include <unordered_map>
--
2.31.1

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Tue Jun 1 09:00:08 UTC 2021 - Christophe Giboudeaux <christophe@krop.fr>
- Add GCC compatibility fixes:
* 0001-Fix-gcc11-build-errors.patch
* 0002-Another-gcc11-fix-3179.patch
-------------------------------------------------------------------
Mon May 10 06:49:08 UTC 2021 - Stephan Kulow <coolo@suse.com>

View File

@ -24,6 +24,9 @@ License: GPL-3.0-or-later
URL: https://github.com/danmar/cppcheck
Source: https://github.com/danmar/cppcheck/archive/refs/tags/%{version}.tar.gz#/%{name}-%{version}.tar.gz
Patch0: fix-i586.patch
# PATCH-FIX-UPSTREAM
Patch1: 0001-Fix-gcc11-build-errors.patch
Patch2: 0002-Another-gcc11-fix-3179.patch
BuildRequires: cmake
BuildRequires: docbook-xsl-stylesheets
BuildRequires: gcc-c++