summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Rondeau <tom@trondeau.com>2014-10-23 18:02:12 -0400
committerTom Rondeau <tom@trondeau.com>2014-10-23 18:02:12 -0400
commit82779dce49e149d9cb5acc4d77937cda59e676bd (patch)
treeddb7465c6eb791e49f2c6e132745de76e646a342
parent6f1913bffaded16d05c475375d2048eb0432bfca (diff)
parentbeae08be99f41731899697ae9d18c9c20f8629e4 (diff)
Merge branch 'maint'
-rw-r--r--gr-blocks/lib/multiply_matrix_cc_impl.cc2
-rw-r--r--gr-blocks/lib/multiply_matrix_ff_impl.cc2
2 files changed, 2 insertions, 2 deletions
diff --git a/gr-blocks/lib/multiply_matrix_cc_impl.cc b/gr-blocks/lib/multiply_matrix_cc_impl.cc
index 55f2262e57..eaa902ec49 100644
--- a/gr-blocks/lib/multiply_matrix_cc_impl.cc
+++ b/gr-blocks/lib/multiply_matrix_cc_impl.cc
@@ -170,7 +170,7 @@ namespace gr {
}
}
- if (not set_A(new_A)) {
+ if (!set_A(new_A)) {
GR_LOG_ALERT(d_logger, "Invalid message to set A.");
}
}
diff --git a/gr-blocks/lib/multiply_matrix_ff_impl.cc b/gr-blocks/lib/multiply_matrix_ff_impl.cc
index 808e0cefd5..fb0a6d587f 100644
--- a/gr-blocks/lib/multiply_matrix_ff_impl.cc
+++ b/gr-blocks/lib/multiply_matrix_ff_impl.cc
@@ -170,7 +170,7 @@ namespace gr {
}
}
- if (not set_A(new_A)) {
+ if (!set_A(new_A)) {
GR_LOG_ALERT(d_logger, "Invalid message to set A.");
}
}