summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJosh Blum <josh@joshknows.com>2021-01-22 21:04:57 -0600
committerMartin Braun <martin@gnuradio.org>2021-01-27 07:31:08 -0800
commit6ba5747e48a9154f21ca425919f51c91c97d4d6f (patch)
tree2b3967a206670e7f6cc515e96544bac94d45069f
parentaa42a5cc57ab6750a103fccac9468321a9a795ef (diff)
qtgui: replace use of or macro with ||
This macro is not defined without including ciso646 https://www.cplusplus.com/reference/ciso646/ gnuradio otherwise does not use these macros Signed-off-by: Josh Blum <josh@joshknows.com>
-rw-r--r--gr-qtgui/lib/TimeRasterDisplayPlot.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/gr-qtgui/lib/TimeRasterDisplayPlot.cc b/gr-qtgui/lib/TimeRasterDisplayPlot.cc
index 049ad7ddcf..c636f2a999 100644
--- a/gr-qtgui/lib/TimeRasterDisplayPlot.cc
+++ b/gr-qtgui/lib/TimeRasterDisplayPlot.cc
@@ -350,7 +350,7 @@ protected:
}
double x_label = d_x_start_value + x / (double)d_cols * d_x_delta_value;
- if ((d_y_delta_value > 999.0) or (d_y_delta_value <= 1.0)) {
+ if ((d_y_delta_value > 999.0) || (d_y_delta_value <= 1.0)) {
QwtText t(QString(QString("").asprintf("%.2f, %.2e", x_label, y)));
return t;
} else {