[cppcheck/f16] Update to 1.50.
Jussi Lehtola
jussilehtola at fedoraproject.org
Fri Aug 19 08:27:19 UTC 2011
commit 46552115da0849800ad3ff29d3a93c82c4b8a9c8
Author: Jussi Lehtola <jussilehtola at fedoraproject.org>
Date: Fri Aug 19 11:27:03 2011 +0300
Update to 1.50.
cppcheck-1.50-preprocessor.patch | 43 ++++++++++++++++++++++++++++++++++++++
cppcheck.spec | 8 ++++++-
sources | 2 +-
3 files changed, 51 insertions(+), 2 deletions(-)
---
diff --git a/cppcheck-1.50-preprocessor.patch b/cppcheck-1.50-preprocessor.patch
new file mode 100644
index 0000000..c993c0d
--- /dev/null
+++ b/cppcheck-1.50-preprocessor.patch
@@ -0,0 +1,43 @@
+diff -up cppcheck-1.50/lib/preprocessor.cpp.orig cppcheck-1.50/lib/preprocessor.cpp
+--- cppcheck-1.50/lib/preprocessor.cpp.orig 2011-08-14 10:45:53.000000000 +0300
++++ cppcheck-1.50/lib/preprocessor.cpp 2011-08-19 10:17:20.240800771 +0300
+@@ -1716,8 +1716,10 @@ std::string Preprocessor::getcode(const
+ continue;
+ }
+
+- std::string def = getdef(line, true);
+- std::string ndef = getdef(line, false);
++ const std::string def = getdef(line, true);
++ const std::string ndef = getdef(line, false);
++
++ const bool emptymatch = matching_ifdef.empty() | matched_ifdef.empty();
+
+ if (line.compare(0, 8, "#define ") == 0)
+ {
+@@ -1742,7 +1744,7 @@ std::string Preprocessor::getcode(const
+ }
+ }
+
+- else if (line.compare(0, 7, "#elif !") == 0)
++ else if (!emptymatch && line.compare(0, 7, "#elif !") == 0)
+ {
+ if (matched_ifdef.back())
+ {
+@@ -1758,7 +1760,7 @@ std::string Preprocessor::getcode(const
+ }
+ }
+
+- else if (line.compare(0, 6, "#elif ") == 0)
++ else if (!emptymatch && line.compare(0, 6, "#elif ") == 0)
+ {
+ if (matched_ifdef.back())
+ {
+@@ -1786,7 +1788,7 @@ std::string Preprocessor::getcode(const
+ matched_ifdef.push_back(matching_ifdef.back());
+ }
+
+- else if (line == "#else")
++ else if (!emptymatch && line == "#else")
+ {
+ if (! matched_ifdef.empty())
+ matching_ifdef.back() = ! matched_ifdef.back();
diff --git a/cppcheck.spec b/cppcheck.spec
index 4551061..c9f6b28 100644
--- a/cppcheck.spec
+++ b/cppcheck.spec
@@ -1,11 +1,13 @@
Name: cppcheck
-Version: 1.49
+Version: 1.50
Release: 1%{?dist}
Summary: A tool for static C/C++ code analysis
Group: Development/Languages
License: GPLv3+
URL: http://cppcheck.wiki.sourceforge.net/
Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
+# Fix BZ #730580
+Patch0: cppcheck-1.50-preprocessor.patch
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildRequires: pcre-devel
@@ -24,6 +26,7 @@ various compiler extensions, inline assembly code, etc.
%prep
%setup -q
+%patch0 -p1
# Make sure bundled tinyxml is not used
rm -r externals/tinyxml
@@ -48,6 +51,9 @@ rm -rf %{buildroot}
%{_bindir}/cppcheck
%changelog
+* Sun Aug 14 2011 Jussi Lehtola <jussilehtola at fedoraproject.org> - 1.50-1
+- Update to 1.50.
+
* Mon Jun 13 2011 Jussi Lehtola <jussilehtola at fedoraproject.org> - 1.49-1
- Update to 1.49.
diff --git a/sources b/sources
index b04bce2..30393bd 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3af62285e268343fb9b8261364a1c1ef cppcheck-1.49.tar.bz2
+79ef3898b246ba9c143155d5ad23dbd1 cppcheck-1.50.tar.bz2
More information about the scm-commits
mailing list