summaryrefslogtreecommitdiff
path: root/gr-blocks
diff options
context:
space:
mode:
authorMarcus Müller <mmueller@gnuradio.org>2019-08-17 20:32:20 +0200
committerMarcus Müller <marcus@hostalia.de>2019-08-22 15:05:58 +0200
commitb08d13aed2a7e7ffdee09833bb24db8ce92dce66 (patch)
tree4846eebe25b48c615cbe07d2a9f4e79d5e8ff72d /gr-blocks
parentc6cb3bbc35153a9635d69eddab0d252f7441b854 (diff)
clang-tidy in gnuradio-runtime: use empty() instead of size()!=0
Diffstat (limited to 'gr-blocks')
-rw-r--r--gr-blocks/lib/file_meta_source_impl.cc2
-rw-r--r--gr-blocks/lib/multiply_matrix_impl.cc2
-rw-r--r--gr-blocks/lib/qa_gr_flowgraph.cc4
-rw-r--r--gr-blocks/lib/tag_debug_impl.cc4
-rw-r--r--gr-blocks/lib/tag_gate_impl.cc2
-rw-r--r--gr-blocks/lib/tagged_file_sink_impl.cc4
-rw-r--r--gr-blocks/lib/tagged_stream_align_impl.cc2
-rw-r--r--gr-blocks/lib/udp_sink_impl.cc2
-rw-r--r--gr-blocks/lib/udp_source_impl.cc2
-rw-r--r--gr-blocks/lib/vector_source_impl.cc4
10 files changed, 14 insertions, 14 deletions
diff --git a/gr-blocks/lib/file_meta_source_impl.cc b/gr-blocks/lib/file_meta_source_impl.cc
index b395d5d8c7..557abee7cc 100644
--- a/gr-blocks/lib/file_meta_source_impl.cc
+++ b/gr-blocks/lib/file_meta_source_impl.cc
@@ -258,7 +258,7 @@ bool file_meta_source_impl::open(const std::string& filename,
bool ret = true;
if (d_state == STATE_DETACHED) {
std::string s;
- if (hdr_filename == "")
+ if (hdr_filename.empty())
s = filename + ".hdr";
else
s = hdr_filename;
diff --git a/gr-blocks/lib/multiply_matrix_impl.cc b/gr-blocks/lib/multiply_matrix_impl.cc
index b9c7ed1dce..e1b9c746c6 100644
--- a/gr-blocks/lib/multiply_matrix_impl.cc
+++ b/gr-blocks/lib/multiply_matrix_impl.cc
@@ -212,7 +212,7 @@ typename multiply_matrix<T>::sptr
multiply_matrix<T>::make(std::vector<std::vector<T>> A,
gr::block::tag_propagation_policy_t tag_propagation_policy)
{
- if (A.empty() || A[0].size() == 0) {
+ if (A.empty() || A[0].empty()) {
throw std::invalid_argument("matrix A has invalid dimensions.");
}
return gnuradio::get_initial_sptr(
diff --git a/gr-blocks/lib/qa_gr_flowgraph.cc b/gr-blocks/lib/qa_gr_flowgraph.cc
index c6d1ca1c6d..e35ccc49fd 100644
--- a/gr-blocks/lib/qa_gr_flowgraph.cc
+++ b/gr-blocks/lib/qa_gr_flowgraph.cc
@@ -269,8 +269,8 @@ BOOST_AUTO_TEST_CASE(t15_clear)
fg->clear();
- BOOST_REQUIRE(fg->edges().size() == 0);
- BOOST_REQUIRE(fg->calc_used_blocks().size() == 0);
+ BOOST_REQUIRE(fg->edges().empty());
+ BOOST_REQUIRE(fg->calc_used_blocks().empty());
}
BOOST_AUTO_TEST_CASE(t16_partition)
diff --git a/gr-blocks/lib/tag_debug_impl.cc b/gr-blocks/lib/tag_debug_impl.cc
index f4faff8e7c..82a06354e8 100644
--- a/gr-blocks/lib/tag_debug_impl.cc
+++ b/gr-blocks/lib/tag_debug_impl.cc
@@ -71,7 +71,7 @@ void tag_debug_impl::set_display(bool d) { d_display = d; }
void tag_debug_impl::set_key_filter(const std::string& key_filter)
{
- if (key_filter == "")
+ if (key_filter.empty())
d_filter = pmt::PMT_NIL;
else
d_filter = pmt::intern(key_filter);
@@ -104,7 +104,7 @@ int tag_debug_impl::work(int noutput_items,
else
get_tags_in_range(d_tags, i, abs_N, end_N, d_filter);
- if (d_tags.size() > 0) {
+ if (!d_tags.empty()) {
toprint = true;
}
diff --git a/gr-blocks/lib/tag_gate_impl.cc b/gr-blocks/lib/tag_gate_impl.cc
index 1ced79a7a8..6367eebfa1 100644
--- a/gr-blocks/lib/tag_gate_impl.cc
+++ b/gr-blocks/lib/tag_gate_impl.cc
@@ -64,7 +64,7 @@ void tag_gate_impl::set_propagation(bool propagate_tags)
void tag_gate_impl::set_single_key(const std::string& single_key)
{
- if (single_key == "") {
+ if (single_key.empty()) {
d_single_key = pmt::PMT_NIL;
d_single_key_set = false;
} else {
diff --git a/gr-blocks/lib/tagged_file_sink_impl.cc b/gr-blocks/lib/tagged_file_sink_impl.cc
index b4e6f2e7cf..5b53bd1f74 100644
--- a/gr-blocks/lib/tagged_file_sink_impl.cc
+++ b/gr-blocks/lib/tagged_file_sink_impl.cc
@@ -94,7 +94,7 @@ int tagged_file_sink_impl::work(int noutput_items,
// Look for a time tag and initialize d_timeval.
std::vector<tag_t> time_tags_outer;
get_tags_in_range(time_tags_outer, 0, start_N, end_N, tkey);
- if (time_tags_outer.size() > 0) {
+ if (!time_tags_outer.empty()) {
const tag_t tag = time_tags_outer[0];
uint64_t offset = tag.offset;
pmt::pmt_t time = tag.value;
@@ -122,7 +122,7 @@ int tagged_file_sink_impl::work(int noutput_items,
std::vector<tag_t> time_tags;
// get_tags_in_range(time_tags, 0, d_last_N, N, gr_tags::key_time);
get_tags_in_range(time_tags, 0, d_last_N, N, tkey);
- if (time_tags.size() > 0) {
+ if (!time_tags.empty()) {
const tag_t tag = time_tags[time_tags.size() - 1];
uint64_t time_nitems = tag.offset;
diff --git a/gr-blocks/lib/tagged_stream_align_impl.cc b/gr-blocks/lib/tagged_stream_align_impl.cc
index 6c091da984..5bd99cd4b2 100644
--- a/gr-blocks/lib/tagged_stream_align_impl.cc
+++ b/gr-blocks/lib/tagged_stream_align_impl.cc
@@ -72,7 +72,7 @@ int tagged_stream_align_impl::general_work(int noutput_items,
} else {
get_tags_in_range(
tags, 0, nitems_read(0), nitems_read(0) + ninput_items[0], d_lengthtag);
- if (tags.size() > 0) {
+ if (!tags.empty()) {
d_have_sync = true;
consume_each(tags[0].offset - nitems_read(0));
} else {
diff --git a/gr-blocks/lib/udp_sink_impl.cc b/gr-blocks/lib/udp_sink_impl.cc
index 885503d0f1..19c4815d76 100644
--- a/gr-blocks/lib/udp_sink_impl.cc
+++ b/gr-blocks/lib/udp_sink_impl.cc
@@ -70,7 +70,7 @@ void udp_sink_impl::connect(const std::string& host, int port)
disconnect();
std::string s_port = (boost::format("%d") % port).str();
- if (host.size() > 0) {
+ if (!host.empty()) {
boost::asio::ip::udp::resolver resolver(d_io_service);
boost::asio::ip::udp::resolver::query query(
host, s_port, boost::asio::ip::resolver_query_base::passive);
diff --git a/gr-blocks/lib/udp_source_impl.cc b/gr-blocks/lib/udp_source_impl.cc
index a668086565..8719bec642 100644
--- a/gr-blocks/lib/udp_source_impl.cc
+++ b/gr-blocks/lib/udp_source_impl.cc
@@ -84,7 +84,7 @@ void udp_source_impl::connect(const std::string& host, int port)
std::string s_port;
s_port = (boost::format("%d") % d_port).str();
- if (host.size() > 0) {
+ if (!host.empty()) {
boost::asio::ip::udp::resolver resolver(d_io_service);
boost::asio::ip::udp::resolver::query query(
d_host, s_port, boost::asio::ip::resolver_query_base::passive);
diff --git a/gr-blocks/lib/vector_source_impl.cc b/gr-blocks/lib/vector_source_impl.cc
index b9709496fb..286681bc9b 100644
--- a/gr-blocks/lib/vector_source_impl.cc
+++ b/gr-blocks/lib/vector_source_impl.cc
@@ -57,7 +57,7 @@ vector_source_impl<T>::vector_source_impl(const std::vector<T>& data,
d_vlen(vlen),
d_tags(tags)
{
- if (tags.size() == 0) {
+ if (tags.empty()) {
d_settags = 0;
} else {
d_settags = 1;
@@ -79,7 +79,7 @@ void vector_source_impl<T>::set_data(const std::vector<T>& data,
d_data = data;
d_tags = tags;
rewind();
- if (tags.size() == 0) {
+ if (tags.empty()) {
d_settags = false;
} else {
d_settags = true;