From 6ba5747e48a9154f21ca425919f51c91c97d4d6f Mon Sep 17 00:00:00 2001
From: Josh Blum <josh@joshknows.com>
Date: Fri, 22 Jan 2021 21:04:57 -0600
Subject: 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>
---
gr-qtgui/lib/TimeRasterDisplayPlot.cc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'gr-qtgui/lib/TimeRasterDisplayPlot.cc')
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 {
--
cgit v1.2.3