summaryrefslogtreecommitdiff
path: root/gr-trellis/include
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/include
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/include')
-rw-r--r--gr-trellis/include/gnuradio/trellis/calc_metric.h4
-rw-r--r--gr-trellis/include/gnuradio/trellis/constellation_metrics_cf.h2
-rw-r--r--gr-trellis/include/gnuradio/trellis/core_algorithms.h4
-rw-r--r--gr-trellis/include/gnuradio/trellis/encoder.h2
-rw-r--r--gr-trellis/include/gnuradio/trellis/fsm.h2
-rw-r--r--gr-trellis/include/gnuradio/trellis/interleaver.h2
-rw-r--r--gr-trellis/include/gnuradio/trellis/metrics.h2
-rw-r--r--gr-trellis/include/gnuradio/trellis/pccc_decoder_blk.h4
-rw-r--r--gr-trellis/include/gnuradio/trellis/pccc_decoder_combined_blk.h6
-rw-r--r--gr-trellis/include/gnuradio/trellis/pccc_encoder.h4
-rw-r--r--gr-trellis/include/gnuradio/trellis/permutation.h2
-rw-r--r--gr-trellis/include/gnuradio/trellis/sccc_decoder_blk.h4
-rw-r--r--gr-trellis/include/gnuradio/trellis/sccc_decoder_combined_blk.h6
-rw-r--r--gr-trellis/include/gnuradio/trellis/sccc_encoder.h2
-rw-r--r--gr-trellis/include/gnuradio/trellis/siso_combined_f.h6
-rw-r--r--gr-trellis/include/gnuradio/trellis/siso_f.h4
-rw-r--r--gr-trellis/include/gnuradio/trellis/viterbi.h4
-rw-r--r--gr-trellis/include/gnuradio/trellis/viterbi_combined.h4
18 files changed, 32 insertions, 32 deletions
diff --git a/gr-trellis/include/gnuradio/trellis/calc_metric.h b/gr-trellis/include/gnuradio/trellis/calc_metric.h
index 053a9db9ce..554c10456f 100644
--- a/gr-trellis/include/gnuradio/trellis/calc_metric.h
+++ b/gr-trellis/include/gnuradio/trellis/calc_metric.h
@@ -23,9 +23,9 @@
#ifndef INCLUDED_CALC_METRIC_H
#define INCLUDED_CALC_METRIC_H
-#include <vector>
-#include <gnuradio/gr_complex.h>
#include <gnuradio/digital/metric_type.h>
+#include <gnuradio/gr_complex.h>
+#include <vector>
namespace gr {
namespace trellis {
diff --git a/gr-trellis/include/gnuradio/trellis/constellation_metrics_cf.h b/gr-trellis/include/gnuradio/trellis/constellation_metrics_cf.h
index 9dcac004b9..66866ba33c 100644
--- a/gr-trellis/include/gnuradio/trellis/constellation_metrics_cf.h
+++ b/gr-trellis/include/gnuradio/trellis/constellation_metrics_cf.h
@@ -23,10 +23,10 @@
#ifndef INCLUDED_TRELLIS_CONSTELLATION_METRICS_CF_H
#define INCLUDED_TRELLIS_CONSTELLATION_METRICS_CF_H
-#include <gnuradio/trellis/api.h>
#include <gnuradio/block.h>
#include <gnuradio/digital/constellation.h>
#include <gnuradio/digital/metric_type.h>
+#include <gnuradio/trellis/api.h>
namespace gr {
namespace trellis {
diff --git a/gr-trellis/include/gnuradio/trellis/core_algorithms.h b/gr-trellis/include/gnuradio/trellis/core_algorithms.h
index ffd78c0fdb..93055e3714 100644
--- a/gr-trellis/include/gnuradio/trellis/core_algorithms.h
+++ b/gr-trellis/include/gnuradio/trellis/core_algorithms.h
@@ -23,11 +23,11 @@
#ifndef INCLUDED_CORE_ALGORITHMS_H
#define INCLUDED_CORE_ALGORITHMS_H
-#include <cmath>
-#include <vector>
#include <gnuradio/digital/metric_type.h>
#include <gnuradio/trellis/fsm.h>
#include <gnuradio/trellis/interleaver.h>
+#include <cmath>
+#include <vector>
namespace gr {
namespace trellis {
diff --git a/gr-trellis/include/gnuradio/trellis/encoder.h b/gr-trellis/include/gnuradio/trellis/encoder.h
index 15c64063b1..11f8a63969 100644
--- a/gr-trellis/include/gnuradio/trellis/encoder.h
+++ b/gr-trellis/include/gnuradio/trellis/encoder.h
@@ -23,9 +23,9 @@
#ifndef ENCODER_H
#define ENCODER_H
+#include <gnuradio/sync_block.h>
#include <gnuradio/trellis/api.h>
#include <gnuradio/trellis/fsm.h>
-#include <gnuradio/sync_block.h>
#include <cstdint>
namespace gr {
diff --git a/gr-trellis/include/gnuradio/trellis/fsm.h b/gr-trellis/include/gnuradio/trellis/fsm.h
index 6ce9cec0ea..5daf8d38d6 100644
--- a/gr-trellis/include/gnuradio/trellis/fsm.h
+++ b/gr-trellis/include/gnuradio/trellis/fsm.h
@@ -24,8 +24,8 @@
#define INCLUDED_TRELLIS_FSM_H
#include <gnuradio/trellis/api.h>
-#include <vector>
#include <iosfwd>
+#include <vector>
namespace gr {
namespace trellis {
diff --git a/gr-trellis/include/gnuradio/trellis/interleaver.h b/gr-trellis/include/gnuradio/trellis/interleaver.h
index caf0f80a09..230114b6c1 100644
--- a/gr-trellis/include/gnuradio/trellis/interleaver.h
+++ b/gr-trellis/include/gnuradio/trellis/interleaver.h
@@ -24,8 +24,8 @@
#define INCLUDED_TRELLIS_INTERLEAVER_H
#include <gnuradio/trellis/api.h>
-#include <vector>
#include <string>
+#include <vector>
namespace gr {
namespace trellis {
diff --git a/gr-trellis/include/gnuradio/trellis/metrics.h b/gr-trellis/include/gnuradio/trellis/metrics.h
index b9af40a25c..96b04e9187 100644
--- a/gr-trellis/include/gnuradio/trellis/metrics.h
+++ b/gr-trellis/include/gnuradio/trellis/metrics.h
@@ -24,9 +24,9 @@
#ifndef METRICS_H
#define METRICS_H
+#include <gnuradio/block.h>
#include <gnuradio/trellis/api.h>
#include <gnuradio/trellis/calc_metric.h>
-#include <gnuradio/block.h>
#include <cstdint>
namespace gr {
diff --git a/gr-trellis/include/gnuradio/trellis/pccc_decoder_blk.h b/gr-trellis/include/gnuradio/trellis/pccc_decoder_blk.h
index b6ed61ec33..ca3ef05645 100644
--- a/gr-trellis/include/gnuradio/trellis/pccc_decoder_blk.h
+++ b/gr-trellis/include/gnuradio/trellis/pccc_decoder_blk.h
@@ -24,13 +24,13 @@
#ifndef PCCC_DECODER_BLK_H
#define PCCC_DECODER_BLK_H
+#include <gnuradio/block.h>
#include <gnuradio/trellis/api.h>
#include <gnuradio/trellis/fsm.h>
#include <gnuradio/trellis/interleaver.h>
#include <gnuradio/trellis/siso_type.h>
-#include <gnuradio/block.h>
-#include <vector>
#include <cstdint>
+#include <vector>
namespace gr {
namespace trellis {
diff --git a/gr-trellis/include/gnuradio/trellis/pccc_decoder_combined_blk.h b/gr-trellis/include/gnuradio/trellis/pccc_decoder_combined_blk.h
index 0bb9188558..7ad142e72e 100644
--- a/gr-trellis/include/gnuradio/trellis/pccc_decoder_combined_blk.h
+++ b/gr-trellis/include/gnuradio/trellis/pccc_decoder_combined_blk.h
@@ -23,14 +23,14 @@
#ifndef PCCC_DECODER_COMBINED_BLK_H
#define PCCC_DECODER_COMBINED_BLK_H
+#include <gnuradio/block.h>
#include <gnuradio/trellis/api.h>
+#include <gnuradio/trellis/calc_metric.h>
#include <gnuradio/trellis/fsm.h>
#include <gnuradio/trellis/interleaver.h>
-#include <gnuradio/trellis/calc_metric.h>
#include <gnuradio/trellis/siso_type.h>
-#include <gnuradio/block.h>
-#include <vector>
#include <cstdint>
+#include <vector>
namespace gr {
namespace trellis {
diff --git a/gr-trellis/include/gnuradio/trellis/pccc_encoder.h b/gr-trellis/include/gnuradio/trellis/pccc_encoder.h
index b4bb269404..1bff4ac975 100644
--- a/gr-trellis/include/gnuradio/trellis/pccc_encoder.h
+++ b/gr-trellis/include/gnuradio/trellis/pccc_encoder.h
@@ -23,12 +23,12 @@
#ifndef PCCC_ENCODER_H
#define PCCC_ENCODER_H
+#include <gnuradio/sync_block.h>
#include <gnuradio/trellis/api.h>
#include <gnuradio/trellis/fsm.h>
#include <gnuradio/trellis/interleaver.h>
-#include <gnuradio/sync_block.h>
-#include <vector>
#include <cstdint>
+#include <vector>
namespace gr {
namespace trellis {
diff --git a/gr-trellis/include/gnuradio/trellis/permutation.h b/gr-trellis/include/gnuradio/trellis/permutation.h
index 22c586c504..8409324a07 100644
--- a/gr-trellis/include/gnuradio/trellis/permutation.h
+++ b/gr-trellis/include/gnuradio/trellis/permutation.h
@@ -23,9 +23,9 @@
#ifndef INCLUDED_TRELLIS_PERMUTATION_H
#define INCLUDED_TRELLIS_PERMUTATION_H
+#include <gnuradio/sync_block.h>
#include <gnuradio/trellis/api.h>
#include <vector>
-#include <gnuradio/sync_block.h>
namespace gr {
namespace trellis {
diff --git a/gr-trellis/include/gnuradio/trellis/sccc_decoder_blk.h b/gr-trellis/include/gnuradio/trellis/sccc_decoder_blk.h
index 1728199d88..0e197bcf50 100644
--- a/gr-trellis/include/gnuradio/trellis/sccc_decoder_blk.h
+++ b/gr-trellis/include/gnuradio/trellis/sccc_decoder_blk.h
@@ -24,13 +24,13 @@
#ifndef SCCC_DECODER_BLK_H
#define SCCC_DECODER_BLK_H
+#include <gnuradio/block.h>
#include <gnuradio/trellis/api.h>
#include <gnuradio/trellis/fsm.h>
#include <gnuradio/trellis/interleaver.h>
#include <gnuradio/trellis/siso_type.h>
-#include <gnuradio/block.h>
-#include <vector>
#include <cstdint>
+#include <vector>
namespace gr {
namespace trellis {
diff --git a/gr-trellis/include/gnuradio/trellis/sccc_decoder_combined_blk.h b/gr-trellis/include/gnuradio/trellis/sccc_decoder_combined_blk.h
index 177f4e2077..e669b9c742 100644
--- a/gr-trellis/include/gnuradio/trellis/sccc_decoder_combined_blk.h
+++ b/gr-trellis/include/gnuradio/trellis/sccc_decoder_combined_blk.h
@@ -23,14 +23,14 @@
#ifndef SCCC_DECODER_COMBINED_BLK_H
#define SCCC_DECODER_COMBINED_BLK_H
+#include <gnuradio/block.h>
#include <gnuradio/trellis/api.h>
+#include <gnuradio/trellis/calc_metric.h>
#include <gnuradio/trellis/fsm.h>
#include <gnuradio/trellis/interleaver.h>
-#include <gnuradio/trellis/calc_metric.h>
#include <gnuradio/trellis/siso_type.h>
-#include <gnuradio/block.h>
-#include <vector>
#include <cstdint>
+#include <vector>
namespace gr {
namespace trellis {
diff --git a/gr-trellis/include/gnuradio/trellis/sccc_encoder.h b/gr-trellis/include/gnuradio/trellis/sccc_encoder.h
index 8506fd7c21..66c30fcafd 100644
--- a/gr-trellis/include/gnuradio/trellis/sccc_encoder.h
+++ b/gr-trellis/include/gnuradio/trellis/sccc_encoder.h
@@ -23,10 +23,10 @@
#ifndef SCCC_ENCODER_H
#define SCCC_ENCODER_H
+#include <gnuradio/sync_block.h>
#include <gnuradio/trellis/api.h>
#include <gnuradio/trellis/fsm.h>
#include <gnuradio/trellis/interleaver.h>
-#include <gnuradio/sync_block.h>
#include <vector>
namespace gr {
diff --git a/gr-trellis/include/gnuradio/trellis/siso_combined_f.h b/gr-trellis/include/gnuradio/trellis/siso_combined_f.h
index d6249aca62..80f7344a51 100644
--- a/gr-trellis/include/gnuradio/trellis/siso_combined_f.h
+++ b/gr-trellis/include/gnuradio/trellis/siso_combined_f.h
@@ -23,12 +23,12 @@
#ifndef INCLUDED_TRELLIS_SISO_COMBINED_F_H
#define INCLUDED_TRELLIS_SISO_COMBINED_F_H
+#include <gnuradio/block.h>
#include <gnuradio/trellis/api.h>
-#include <gnuradio/trellis/fsm.h>
-#include <gnuradio/trellis/siso_type.h>
#include <gnuradio/trellis/calc_metric.h>
#include <gnuradio/trellis/core_algorithms.h>
-#include <gnuradio/block.h>
+#include <gnuradio/trellis/fsm.h>
+#include <gnuradio/trellis/siso_type.h>
namespace gr {
namespace trellis {
diff --git a/gr-trellis/include/gnuradio/trellis/siso_f.h b/gr-trellis/include/gnuradio/trellis/siso_f.h
index 90ae33309f..4107ee2169 100644
--- a/gr-trellis/include/gnuradio/trellis/siso_f.h
+++ b/gr-trellis/include/gnuradio/trellis/siso_f.h
@@ -23,11 +23,11 @@
#ifndef INCLUDED_TRELLIS_SISO_F_H
#define INCLUDED_TRELLIS_SISO_F_H
+#include <gnuradio/block.h>
#include <gnuradio/trellis/api.h>
+#include <gnuradio/trellis/core_algorithms.h>
#include <gnuradio/trellis/fsm.h>
#include <gnuradio/trellis/siso_type.h>
-#include <gnuradio/trellis/core_algorithms.h>
-#include <gnuradio/block.h>
namespace gr {
namespace trellis {
diff --git a/gr-trellis/include/gnuradio/trellis/viterbi.h b/gr-trellis/include/gnuradio/trellis/viterbi.h
index c432793426..21b5ebbf60 100644
--- a/gr-trellis/include/gnuradio/trellis/viterbi.h
+++ b/gr-trellis/include/gnuradio/trellis/viterbi.h
@@ -24,10 +24,10 @@
#ifndef VITERBI_H
#define VITERBI_H
+#include <gnuradio/block.h>
#include <gnuradio/trellis/api.h>
-#include <gnuradio/trellis/fsm.h>
#include <gnuradio/trellis/core_algorithms.h>
-#include <gnuradio/block.h>
+#include <gnuradio/trellis/fsm.h>
#include <cstdint>
namespace gr {
diff --git a/gr-trellis/include/gnuradio/trellis/viterbi_combined.h b/gr-trellis/include/gnuradio/trellis/viterbi_combined.h
index de1e139e5f..472d37f45a 100644
--- a/gr-trellis/include/gnuradio/trellis/viterbi_combined.h
+++ b/gr-trellis/include/gnuradio/trellis/viterbi_combined.h
@@ -23,11 +23,11 @@
#ifndef VITERBI_COMBINED_H
#define VITERBI_COMBINED_H
+#include <gnuradio/block.h>
#include <gnuradio/trellis/api.h>
-#include <gnuradio/trellis/fsm.h>
#include <gnuradio/trellis/calc_metric.h>
#include <gnuradio/trellis/core_algorithms.h>
-#include <gnuradio/block.h>
+#include <gnuradio/trellis/fsm.h>
#include <cstdint>
namespace gr {
generated by cgit v1.2.3 (git 2.39.1) at 2025-03-28 06:36:41 +0000