summaryrefslogtreecommitdiff
path: root/gr-trellis/lib
diff options
context:
space:
mode:
authorMarcus Müller <mmueller@gnuradio.org>2019-08-07 22:21:18 +0200
committerMarcus Müller <marcus@hostalia.de>2019-08-09 23:04:28 +0200
commitd24b0c8f1ebe1a9681271c014659bf2ecc613e50 (patch)
treea18051dccba5266904571dce8a93128ad62e8453 /gr-trellis/lib
parent65599ad299f030d302386fcda9bc0e3175d9a828 (diff)
clang-format: Ordering all the includes
clang-format: ordering includes in gnuradio-runtime clang-format: ordering includes in gr-filter clang-format: ordering includes in gr-fft clang-format: ordering includes in gr-audio clang-format: ordering includes in gr-analog clang-format: ordering includes in gr-fec clang-format: ordering includes in gr-wavelet clang-format: ordering includes in gr-zeromq clang-format: ordering includes in gr-vocoder clang-format: ordering includes in gr-video-sdl clang-format: ordering includes in gr-trellis clang-format: ordering includes in gr-blocks clang-format: ordering includes in gr-digital clang-format: ordering includes in gr-uhd clang-format: ordering includes in gr-dtv clang-format: ordering includes in gr-channels clang-format: ordering includes in gr-qtgui clang_format.py: re-enable include reordering
Diffstat (limited to 'gr-trellis/lib')
-rw-r--r--gr-trellis/lib/base.cc4
-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/core_algorithms.cc10
-rw-r--r--gr-trellis/lib/fsm.cc12
-rw-r--r--gr-trellis/lib/interleaver.cc14
-rw-r--r--gr-trellis/lib/metrics_impl.cc2
-rw-r--r--gr-trellis/lib/pccc_decoder_blk_impl.cc2
-rw-r--r--gr-trellis/lib/pccc_decoder_combined_blk_impl.cc2
-rw-r--r--gr-trellis/lib/permutation_impl.cc2
-rw-r--r--gr-trellis/lib/sccc_decoder_blk_impl.cc2
-rw-r--r--gr-trellis/lib/sccc_decoder_combined_blk_impl.cc2
-rw-r--r--gr-trellis/lib/siso_combined_f_impl.cc4
-rw-r--r--gr-trellis/lib/siso_f_impl.cc4
-rw-r--r--gr-trellis/lib/siso_f_impl.h4
15 files changed, 34 insertions, 34 deletions
diff --git a/gr-trellis/lib/base.cc b/gr-trellis/lib/base.cc
index 15ccc80f75..bec69bf298 100644
--- a/gr-trellis/lib/base.cc
+++ b/gr-trellis/lib/base.cc
@@ -20,10 +20,10 @@
* Boston, MA 02110-1301, USA.
*/
+#include <gnuradio/trellis/base.h>
+#include <cmath>
#include <cstdio>
#include <stdexcept>
-#include <cmath>
-#include <gnuradio/trellis/base.h>
namespace gr {
namespace trellis {
diff --git a/gr-trellis/lib/calc_metric.cc b/gr-trellis/lib/calc_metric.cc
index 587edd437e..e427174c33 100644
--- a/gr-trellis/lib/calc_metric.cc
+++ b/gr-trellis/lib/calc_metric.cc
@@ -20,9 +20,9 @@
* Boston, MA 02110-1301, USA.
*/
+#include <gnuradio/trellis/calc_metric.h>
#include <float.h>
#include <stdexcept>
-#include <gnuradio/trellis/calc_metric.h>
namespace gr {
namespace trellis {
diff --git a/gr-trellis/lib/constellation_metrics_cf_impl.cc b/gr-trellis/lib/constellation_metrics_cf_impl.cc
index 6658e0e518..8dac03f0a1 100644
--- a/gr-trellis/lib/constellation_metrics_cf_impl.cc
+++ b/gr-trellis/lib/constellation_metrics_cf_impl.cc
@@ -27,8 +27,8 @@
#include "constellation_metrics_cf_impl.h"
#include <gnuradio/io_signature.h>
#include <assert.h>
-#include <stdexcept>
#include <iostream>
+#include <stdexcept>
namespace gr {
namespace trellis {
diff --git a/gr-trellis/lib/core_algorithms.cc b/gr-trellis/lib/core_algorithms.cc
index d12896d342..f3f75fb744 100644
--- a/gr-trellis/lib/core_algorithms.cc
+++ b/gr-trellis/lib/core_algorithms.cc
@@ -20,11 +20,11 @@
* Boston, MA 02110-1301, USA.
*/
+#include <gnuradio/trellis/calc_metric.h>
+#include <gnuradio/trellis/core_algorithms.h>
#include <cstring>
-#include <stdexcept>
#include <iostream>
-#include <gnuradio/trellis/core_algorithms.h>
-#include <gnuradio/trellis/calc_metric.h>
+#include <stdexcept>
namespace gr {
namespace trellis {
@@ -511,8 +511,8 @@ void siso_algorithm(int I,
const float* priori,
const float* prioro,
float* post //,
- // std::vector<float> &alpha,
- // std::vector<float> &beta
+ // std::vector<float> &alpha,
+ // std::vector<float> &beta
)
{
float norm, mm, minm;
diff --git a/gr-trellis/lib/fsm.cc b/gr-trellis/lib/fsm.cc
index ca28266b70..bceed6e1ad 100644
--- a/gr-trellis/lib/fsm.cc
+++ b/gr-trellis/lib/fsm.cc
@@ -20,15 +20,15 @@
* Boston, MA 02110-1301, USA.
*/
+#include <gnuradio/trellis/base.h>
+#include <gnuradio/trellis/fsm.h>
+#include <stdlib.h>
+#include <cmath>
#include <cstdio>
-#include <string>
-#include <iostream>
#include <fstream>
+#include <iostream>
#include <stdexcept>
-#include <cmath>
-#include <stdlib.h>
-#include <gnuradio/trellis/base.h>
-#include <gnuradio/trellis/fsm.h>
+#include <string>
namespace gr {
namespace trellis {
diff --git a/gr-trellis/lib/interleaver.cc b/gr-trellis/lib/interleaver.cc
index ae6fb05aa2..5f5b8c0a30 100644
--- a/gr-trellis/lib/interleaver.cc
+++ b/gr-trellis/lib/interleaver.cc
@@ -20,16 +20,16 @@
* Boston, MA 02110-1301, USA.
*/
-#include <cstdlib>
+#include <gnuradio/trellis/interleaver.h>
+#include <gnuradio/trellis/quicksort_index.h>
+#include <gnuradio/xoroshiro128p.h>
+#include <cmath>
#include <cstdio>
-#include <iostream>
-#include <string>
+#include <cstdlib>
#include <fstream>
+#include <iostream>
#include <stdexcept>
-#include <cmath>
-#include <gnuradio/trellis/quicksort_index.h>
-#include <gnuradio/trellis/interleaver.h>
-#include <gnuradio/xoroshiro128p.h>
+#include <string>
namespace gr {
namespace trellis {
diff --git a/gr-trellis/lib/metrics_impl.cc b/gr-trellis/lib/metrics_impl.cc
index f3ebb4f5d3..2a65b40a3f 100644
--- a/gr-trellis/lib/metrics_impl.cc
+++ b/gr-trellis/lib/metrics_impl.cc
@@ -28,8 +28,8 @@
#include "metrics_impl.h"
#include <gnuradio/io_signature.h>
#include <assert.h>
-#include <stdexcept>
#include <iostream>
+#include <stdexcept>
namespace gr {
namespace trellis {
diff --git a/gr-trellis/lib/pccc_decoder_blk_impl.cc b/gr-trellis/lib/pccc_decoder_blk_impl.cc
index d6c817685d..6d3f48b798 100644
--- a/gr-trellis/lib/pccc_decoder_blk_impl.cc
+++ b/gr-trellis/lib/pccc_decoder_blk_impl.cc
@@ -27,8 +27,8 @@
#include "pccc_decoder_blk_impl.h"
#include <gnuradio/io_signature.h>
-#include <iostream>
#include <gnuradio/trellis/core_algorithms.h>
+#include <iostream>
namespace gr {
namespace trellis {
diff --git a/gr-trellis/lib/pccc_decoder_combined_blk_impl.cc b/gr-trellis/lib/pccc_decoder_combined_blk_impl.cc
index b8a93d9118..c9d4432522 100644
--- a/gr-trellis/lib/pccc_decoder_combined_blk_impl.cc
+++ b/gr-trellis/lib/pccc_decoder_combined_blk_impl.cc
@@ -26,8 +26,8 @@
#include "pccc_decoder_combined_blk_impl.h"
#include <gnuradio/io_signature.h>
-#include <iostream>
#include <gnuradio/trellis/core_algorithms.h>
+#include <iostream>
namespace gr {
namespace trellis {
diff --git a/gr-trellis/lib/permutation_impl.cc b/gr-trellis/lib/permutation_impl.cc
index c0e732e1c3..459311c49a 100644
--- a/gr-trellis/lib/permutation_impl.cc
+++ b/gr-trellis/lib/permutation_impl.cc
@@ -26,8 +26,8 @@
#include "permutation_impl.h"
#include <gnuradio/io_signature.h>
-#include <iostream>
#include <string.h>
+#include <iostream>
namespace gr {
namespace trellis {
diff --git a/gr-trellis/lib/sccc_decoder_blk_impl.cc b/gr-trellis/lib/sccc_decoder_blk_impl.cc
index 206dc3f5da..76e27b286b 100644
--- a/gr-trellis/lib/sccc_decoder_blk_impl.cc
+++ b/gr-trellis/lib/sccc_decoder_blk_impl.cc
@@ -27,8 +27,8 @@
#include "sccc_decoder_blk_impl.h"
#include <gnuradio/io_signature.h>
-#include <iostream>
#include <gnuradio/trellis/core_algorithms.h>
+#include <iostream>
namespace gr {
namespace trellis {
diff --git a/gr-trellis/lib/sccc_decoder_combined_blk_impl.cc b/gr-trellis/lib/sccc_decoder_combined_blk_impl.cc
index 6f25189246..eca74491f5 100644
--- a/gr-trellis/lib/sccc_decoder_combined_blk_impl.cc
+++ b/gr-trellis/lib/sccc_decoder_combined_blk_impl.cc
@@ -26,8 +26,8 @@
#include "sccc_decoder_combined_blk_impl.h"
#include <gnuradio/io_signature.h>
-#include <iostream>
#include <gnuradio/trellis/core_algorithms.h>
+#include <iostream>
namespace gr {
namespace trellis {
diff --git a/gr-trellis/lib/siso_combined_f_impl.cc b/gr-trellis/lib/siso_combined_f_impl.cc
index d6decbbafd..cd3ef2edd6 100644
--- a/gr-trellis/lib/siso_combined_f_impl.cc
+++ b/gr-trellis/lib/siso_combined_f_impl.cc
@@ -26,9 +26,9 @@
#include "siso_combined_f_impl.h"
#include <gnuradio/io_signature.h>
-#include <stdexcept>
#include <assert.h>
#include <iostream>
+#include <stdexcept>
namespace gr {
namespace trellis {
@@ -252,7 +252,7 @@ int siso_combined_f_impl::general_work(int noutput_items,
&(in1[n * d_K * d_FSM.I()]),
&(in2[n * d_K * d_D]),
&(out[n * d_K * multiple]) //,
- // d_alpha,d_beta
+ // d_alpha,d_beta
);
}
}
diff --git a/gr-trellis/lib/siso_f_impl.cc b/gr-trellis/lib/siso_f_impl.cc
index c4052fc28e..152d82b5a2 100644
--- a/gr-trellis/lib/siso_f_impl.cc
+++ b/gr-trellis/lib/siso_f_impl.cc
@@ -26,9 +26,9 @@
#include "siso_f_impl.h"
#include <gnuradio/io_signature.h>
-#include <stdexcept>
#include <assert.h>
#include <iostream>
+#include <stdexcept>
namespace gr {
namespace trellis {
@@ -207,7 +207,7 @@ int siso_f_impl::general_work(int noutput_items,
&(in1[n * d_K * d_FSM.I()]),
&(in2[n * d_K * d_FSM.O()]),
&(out[n * d_K * multiple]) //,
- // d_alpha,d_beta
+ // d_alpha,d_beta
);
}
}
diff --git a/gr-trellis/lib/siso_f_impl.h b/gr-trellis/lib/siso_f_impl.h
index 92ac211bcf..4538e372dd 100644
--- a/gr-trellis/lib/siso_f_impl.h
+++ b/gr-trellis/lib/siso_f_impl.h
@@ -24,10 +24,10 @@
#define INCLUDED_TRELLIS_SISO_F_IMPL_H
#include <gnuradio/trellis/api.h>
-#include <gnuradio/trellis/fsm.h>
-#include <gnuradio/trellis/siso_type.h>
#include <gnuradio/trellis/core_algorithms.h>
+#include <gnuradio/trellis/fsm.h>
#include <gnuradio/trellis/siso_f.h>
+#include <gnuradio/trellis/siso_type.h>
namespace gr {
namespace trellis {
generated by cgit v1.2.3 (git 2.39.1) at 2025-03-23 13:42:36 +0000