summaryrefslogtreecommitdiff
path: root/gr-trellis/lib
diff options
context:
space:
mode:
Diffstat (limited to 'gr-trellis/lib')
-rw-r--r--gr-trellis/lib/calc_metric.cc2
-rw-r--r--gr-trellis/lib/constellation_metrics_cf_impl.cc2
-rw-r--r--gr-trellis/lib/fsm.cc2
-rw-r--r--gr-trellis/lib/metrics_impl.cc2
-rw-r--r--gr-trellis/lib/permutation_impl.cc2
-rw-r--r--gr-trellis/lib/siso_combined_f_impl.cc2
-rw-r--r--gr-trellis/lib/siso_f_impl.cc2
7 files changed, 7 insertions, 7 deletions
diff --git a/gr-trellis/lib/calc_metric.cc b/gr-trellis/lib/calc_metric.cc
index 84bf533ada..9f3be1134e 100644
--- a/gr-trellis/lib/calc_metric.cc
+++ b/gr-trellis/lib/calc_metric.cc
@@ -9,7 +9,7 @@
*/
#include <gnuradio/trellis/calc_metric.h>
-#include <float.h>
+#include <cfloat>
#include <stdexcept>
namespace gr {
diff --git a/gr-trellis/lib/constellation_metrics_cf_impl.cc b/gr-trellis/lib/constellation_metrics_cf_impl.cc
index 14c4ce5ff8..48cba1dd03 100644
--- a/gr-trellis/lib/constellation_metrics_cf_impl.cc
+++ b/gr-trellis/lib/constellation_metrics_cf_impl.cc
@@ -14,7 +14,7 @@
#include "constellation_metrics_cf_impl.h"
#include <gnuradio/io_signature.h>
-#include <assert.h>
+#include <cassert>
#include <iostream>
#include <stdexcept>
diff --git a/gr-trellis/lib/fsm.cc b/gr-trellis/lib/fsm.cc
index 1bb6355899..e14a3fb08d 100644
--- a/gr-trellis/lib/fsm.cc
+++ b/gr-trellis/lib/fsm.cc
@@ -11,8 +11,8 @@
#include <gnuradio/logger.h>
#include <gnuradio/trellis/base.h>
#include <gnuradio/trellis/fsm.h>
-#include <stdlib.h>
#include <cmath>
+#include <cstdlib>
#include <fstream>
#include <stdexcept>
#include <string>
diff --git a/gr-trellis/lib/metrics_impl.cc b/gr-trellis/lib/metrics_impl.cc
index ef4233aaf4..4e98a7deea 100644
--- a/gr-trellis/lib/metrics_impl.cc
+++ b/gr-trellis/lib/metrics_impl.cc
@@ -15,7 +15,7 @@
#include "metrics_impl.h"
#include <gnuradio/io_signature.h>
-#include <assert.h>
+#include <cassert>
#include <iostream>
#include <stdexcept>
diff --git a/gr-trellis/lib/permutation_impl.cc b/gr-trellis/lib/permutation_impl.cc
index f97bcc4681..fd663526f3 100644
--- a/gr-trellis/lib/permutation_impl.cc
+++ b/gr-trellis/lib/permutation_impl.cc
@@ -14,7 +14,7 @@
#include "permutation_impl.h"
#include <gnuradio/io_signature.h>
-#include <string.h>
+#include <cstring>
#include <iostream>
namespace gr {
diff --git a/gr-trellis/lib/siso_combined_f_impl.cc b/gr-trellis/lib/siso_combined_f_impl.cc
index d5eb980f76..9b5f5a7d88 100644
--- a/gr-trellis/lib/siso_combined_f_impl.cc
+++ b/gr-trellis/lib/siso_combined_f_impl.cc
@@ -14,7 +14,7 @@
#include "siso_combined_f_impl.h"
#include <gnuradio/io_signature.h>
-#include <assert.h>
+#include <cassert>
#include <iostream>
#include <stdexcept>
diff --git a/gr-trellis/lib/siso_f_impl.cc b/gr-trellis/lib/siso_f_impl.cc
index 15e1cc1df0..cf197f504f 100644
--- a/gr-trellis/lib/siso_f_impl.cc
+++ b/gr-trellis/lib/siso_f_impl.cc
@@ -14,7 +14,7 @@
#include "siso_f_impl.h"
#include <gnuradio/io_signature.h>
-#include <assert.h>
+#include <cassert>
#include <iostream>
#include <stdexcept>