Control: tags -1 patch
Dear Maintainer,
In Ubuntu, the attached patch was applied to achieve the following:
* kcollectd/{graph,misc}.cc: Prefix isnan with std namespace to fix FTBFS
with GCC 6.
Thanks for considering the patch.
Logan Rosen
diff -u kcollectd-0.9/debian/control kcollectd-0.9/debian/control
--- kcollectd-0.9/debian/control
+++ kcollectd-0.9/debian/control
@@ -1,8 +1,7 @@
Source: kcollectd
Section: utils
Priority: extra
-Maintainer: Ubuntu Developers <[email protected]>
-XSBC-Original-Maintainer: M G Berberich <[email protected]>
+Maintainer: M G Berberich <[email protected]>
Build-Depends: debhelper (>= 7), cmake, kdelibs5-dev, shared-mime-info, libboost-filesystem-dev, librrd-dev
Standards-Version: 3.8.4
Homepage: http://www.forwiss.uni-passau.de/~berberic/Linux/kcollectd.html
only in patch2:
unchanged:
--- kcollectd-0.9.orig/kcollectd/graph.cc
+++ kcollectd-0.9/kcollectd/graph.cc
@@ -564,9 +564,9 @@
paint.setPen(Qt::NoPen);
paint.setBrush(QBrush(color_minmax[color_nr++ % 8]));
for(int i=0; i<size; ++i) {
- while (i<size && (isnan(min_data[i]) || isnan(max_data[i]))) ++i;
+ while (i<size && (std::isnan(min_data[i]) || std::isnan(max_data[i]))) ++i;
int l = i;
- while (i<size && !isnan(min_data[i]) && !isnan(max_data[i])) ++i;
+ while (i<size && !std::isnan(min_data[i]) && !std::isnan(max_data[i])) ++i;
const int asize = i-l;
points.resize(asize*2);
int k;
@@ -597,9 +597,9 @@
if (!avg_data.empty()) {
paint.setPen(color_line[color_nr++ % 8]);
for(int i=0; i<size; ++i) {
- while (i<size && isnan(avg_data[i])) ++i;
+ while (i<size && std::isnan(avg_data[i])) ++i;
int l = i;
- while (i<size && !isnan(avg_data[i])) ++i;
+ while (i<size && !std::isnan(avg_data[i])) ++i;
const int asize = i-l;
points.resize(asize);
for(int k=0; k<asize; ++k, ++l) {
only in patch2:
unchanged:
--- kcollectd-0.9.orig/kcollectd/misc.cc
+++ kcollectd-0.9/kcollectd/misc.cc
@@ -119,7 +119,7 @@
// process avg_data
if (!avg_data.empty()) {
for(std::size_t i=0; i<size; ++i) {
- if (isnan(avg_data[i])) continue;
+ if (std::isnan(avg_data[i])) continue;
valid = true;
if (min > avg_data[i]) min = avg_data[i];
if (max < avg_data[i]) max = avg_data[i];
@@ -129,7 +129,7 @@
// process min/max-data
if (!min_data.empty() && !max_data.empty()) {
for(std::size_t i=0; i<size; ++i) {
- if (isnan(min_data[i]) || isnan(max_data[i])) continue;
+ if (std::isnan(min_data[i]) || std::isnan(max_data[i])) continue;
valid = true;
if (min > min_data[i]) min = min_data[i];
if (max < min_data[i]) max = min_data[i];
