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
aru31 · Aug 9, 2019 · d24b0c8 · d24b0c8
1 parent 65599ad
commit d24b0c8
Show file tree

Hide file tree

Showing 793 changed files with 1,288 additions and 1,290 deletions.
diff --git a/gnuradio-runtime/apps/gnuradio-config-info.cc b/gnuradio-runtime/apps/gnuradio-config-info.cc
@@ -25,10 +25,10 @@
 #endif
 
 #include <gnuradio/constants.h>
-#include <gnuradio/sys_paths.h>
 #include <gnuradio/prefs.h>
-#include <boost/program_options.hpp>
+#include <gnuradio/sys_paths.h>
 #include <boost/format.hpp>
+#include <boost/program_options.hpp>
 #include <iostream>
 
 namespace po = boost::program_options;

diff --git a/gnuradio-runtime/include/gnuradio/basic_block.h b/gnuradio-runtime/include/gnuradio/basic_block.h
@@ -24,19 +24,19 @@
 #define INCLUDED_GR_BASIC_BLOCK_H
 
 #include <gnuradio/api.h>
-#include <gnuradio/sptr_magic.h>
+#include <gnuradio/io_signature.h>
 #include <gnuradio/msg_accepter.h>
 #include <gnuradio/runtime_types.h>
-#include <gnuradio/io_signature.h>
+#include <gnuradio/sptr_magic.h>
 #include <gnuradio/thread/thread.h>
 #include <boost/enable_shared_from_this.hpp>
-#include <boost/function.hpp>
 #include <boost/foreach.hpp>
+#include <boost/function.hpp>
 #include <boost/thread/condition_variable.hpp>
-#include <iostream>
-#include <string>
 #include <deque>
+#include <iostream>
 #include <map>
+#include <string>
 
 #ifdef GR_CTRLPORT
 #include <gnuradio/rpcregisterhelpers.h>

diff --git a/gnuradio-runtime/include/gnuradio/block.h b/gnuradio-runtime/include/gnuradio/block.h
@@ -23,11 +23,11 @@
 #ifndef INCLUDED_GR_RUNTIME_BLOCK_H
 #define INCLUDED_GR_RUNTIME_BLOCK_H
 
-#include <gnuradio/config.h>
 #include <gnuradio/api.h>
 #include <gnuradio/basic_block.h>
-#include <gnuradio/tags.h>
+#include <gnuradio/config.h>
 #include <gnuradio/logger.h>
+#include <gnuradio/tags.h>
 #ifdef GR_MPLIB_MPIR
 #include <mpirxx.h>
 #else
@@ -169,8 +169,8 @@ class GR_RUNTIME_API block : public basic_block
      * \param ninput_items	number of input items available on each input stream
      * \param input_items	vector of pointers to the input items, one entry per input
      * stream
-     * \param output_items	vector of pointers to the output items, one entry per output
-     * stream
+     * \param output_items	vector of pointers to the output items, one entry per
+     * output stream
      *
      * \returns number of items actually written to each output stream
      * or WORK_CALLED_PRODUCE or WORK_DONE.  It is OK to return a

diff --git a/gnuradio-runtime/include/gnuradio/block_detail.h b/gnuradio-runtime/include/gnuradio/block_detail.h
@@ -24,10 +24,10 @@
 #define INCLUDED_GR_RUNTIME_BLOCK_DETAIL_H
 
 #include <gnuradio/api.h>
+#include <gnuradio/high_res_timer.h>
 #include <gnuradio/runtime_types.h>
-#include <gnuradio/tpb_detail.h>
 #include <gnuradio/tags.h>
-#include <gnuradio/high_res_timer.h>
+#include <gnuradio/tpb_detail.h>
 #include <stdexcept>
 
 namespace gr {

diff --git a/gnuradio-runtime/include/gnuradio/buffer.h b/gnuradio-runtime/include/gnuradio/buffer.h
@@ -26,8 +26,8 @@
 #include <gnuradio/api.h>
 #include <gnuradio/runtime_types.h>
 #include <gnuradio/tags.h>
-#include <boost/weak_ptr.hpp>
 #include <gnuradio/thread/thread.h>
+#include <boost/weak_ptr.hpp>
 #include <map>
 
 namespace gr {

diff --git a/gnuradio-runtime/include/gnuradio/logger.h b/gnuradio-runtime/include/gnuradio/logger.h
@@ -37,18 +37,18 @@ typedef int mode_t;
 
 #include <gnuradio/api.h>
 #include <assert.h>
-#include <iostream>
-#include <time.h>
-#include <boost/filesystem.hpp>
-#include <boost/thread.hpp>
-#include <boost/format.hpp>
-#include <pmt/pmt.h>
 #include <log4cpp/Category.hh>
-#include <log4cpp/PropertyConfigurator.hh>
 #include <log4cpp/FileAppender.hh>
-#include <log4cpp/RollingFileAppender.hh>
 #include <log4cpp/OstreamAppender.hh>
 #include <log4cpp/PatternLayout.hh>
+#include <log4cpp/PropertyConfigurator.hh>
+#include <log4cpp/RollingFileAppender.hh>
+#include <pmt/pmt.h>
+#include <time.h>
+#include <boost/filesystem.hpp>
+#include <boost/format.hpp>
+#include <boost/thread.hpp>
+#include <iostream>
 
 namespace gr {
 

diff --git a/gnuradio-runtime/include/gnuradio/math.h b/gnuradio-runtime/include/gnuradio/math.h
@@ -27,9 +27,9 @@
 #ifndef _GR_MATH_H_
 #define _GR_MATH_H_
 
-#include <cmath>
 #include <gnuradio/api.h>
 #include <gnuradio/gr_complex.h>
+#include <cmath>
 
 /*
  * \brief Define commonly used mathematical constants

diff --git a/gnuradio-runtime/include/gnuradio/messages/msg_passing.h b/gnuradio-runtime/include/gnuradio/messages/msg_passing.h
@@ -27,8 +27,8 @@
  */
 
 #include <gnuradio/api.h>
-#include <pmt/pmt.h>
 #include <gnuradio/messages/msg_accepter.h>
+#include <pmt/pmt.h>
 
 namespace gr {
 namespace messages {

diff --git a/gnuradio-runtime/include/gnuradio/nco.h b/gnuradio-runtime/include/gnuradio/nco.h
@@ -23,12 +23,12 @@
 #ifndef _GR_NCO_H_
 #define _GR_NCO_H_
 
-#include <gnuradio/sincos.h>
 #include <gnuradio/gr_complex.h>
 #include <gnuradio/math.h>
+#include <gnuradio/sincos.h>
 
-#include <vector>
 #include <cmath>
+#include <vector>
 
 namespace gr {
 

diff --git a/gnuradio-runtime/include/gnuradio/prefs.h b/gnuradio-runtime/include/gnuradio/prefs.h
@@ -24,9 +24,9 @@
 #define INCLUDED_GR_PREFS_H
 
 #include <gnuradio/api.h>
-#include <string>
-#include <map>
 #include <gnuradio/thread/thread.h>
+#include <map>
+#include <string>
 
 namespace gr {
 

diff --git a/gnuradio-runtime/include/gnuradio/py_feval.h b/gnuradio-runtime/include/gnuradio/py_feval.h
@@ -23,9 +23,9 @@
 #ifndef INCLUDED_GR_PY_FEVAL_H
 #define INCLUDED_GR_PY_FEVAL_H
 
+#include <gnuradio/feval.h>
 #include <Python.h>
 #include <pmt/pmt.h>
-#include <gnuradio/feval.h>
 
 class ensure_py_gil_state
 {

diff --git a/gnuradio-runtime/include/gnuradio/pycallback_object.h b/gnuradio-runtime/include/gnuradio/pycallback_object.h
@@ -20,10 +20,10 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#include <iostream>
 #include <gnuradio/rpcregisterhelpers.h>
 #include <pythread.h>
 #include <boost/format.hpp>
+#include <iostream>
 
 enum pyport_t { PYPORT_STRING, PYPORT_FLOAT };
 

diff --git a/gnuradio-runtime/include/gnuradio/rpcmanager.h b/gnuradio-runtime/include/gnuradio/rpcmanager.h
@@ -26,8 +26,8 @@
 #include <gnuradio/api.h>
 #include <gnuradio/rpcmanager_base.h>
 #include <gnuradio/rpcserver_booter_aggregator.h>
-#include <memory>
 #include <iostream>
+#include <memory>
 
 class GR_RUNTIME_API rpcmanager : public virtual rpcmanager_base
 {

diff --git a/gnuradio-runtime/include/gnuradio/rpcpmtconverters_thrift.h b/gnuradio-runtime/include/gnuradio/rpcpmtconverters_thrift.h
@@ -22,10 +22,10 @@
 #ifndef RPCPMTCONVERTERS_THRIFT_H
 #define RPCPMTCONVERTERS_THRIFT_H
 
+#include "thrift/gnuradio_types.h"
 #include <pmt/pmt.h>
 #include <boost/noncopyable.hpp>
 #include <boost/ptr_container/ptr_map.hpp>
-#include "thrift/gnuradio_types.h"
 
 
 namespace rpcpmtconverter {

diff --git a/gnuradio-runtime/include/gnuradio/rpcregisterhelpers.h b/gnuradio-runtime/include/gnuradio/rpcregisterhelpers.h
@@ -23,13 +23,13 @@
 #ifndef RPCREGISTERHELPERS_H
 #define RPCREGISTERHELPERS_H
 
-#include <stdio.h>
-#include <sstream>
-#include <iostream>
-#include <gnuradio/rpcserver_booter_base.h>
 #include <gnuradio/rpcmanager.h>
-#include <gnuradio/rpcserver_selector.h>
 #include <gnuradio/rpcserver_base.h>
+#include <gnuradio/rpcserver_booter_base.h>
+#include <gnuradio/rpcserver_selector.h>
+#include <stdio.h>
+#include <iostream>
+#include <sstream>
 
 // Fixes circular dependency issue before including block_registry.h
 class rpcbasic_base;

diff --git a/gnuradio-runtime/include/gnuradio/rpcserver_aggregator.h b/gnuradio-runtime/include/gnuradio/rpcserver_aggregator.h
@@ -23,10 +23,10 @@
 #ifndef RPCSERVER_AGGREGATOR_H
 #define RPCSERVER_AGGREGATOR_H
 
-#include <vector>
-#include <string>
-#include <gnuradio/rpcserver_base.h>
 #include <gnuradio/rpcmanager_base.h>
+#include <gnuradio/rpcserver_base.h>
+#include <string>
+#include <vector>
 
 class rpcserver_aggregator : public virtual rpcserver_base
 {

diff --git a/gnuradio-runtime/include/gnuradio/rpcserver_booter_aggregator.h b/gnuradio-runtime/include/gnuradio/rpcserver_booter_aggregator.h
@@ -24,8 +24,8 @@
 #define RPCSERVER_BOOTER_AGGREGATOR
 
 #include <gnuradio/api.h>
-#include <gnuradio/rpcserver_booter_base.h>
 #include <gnuradio/rpcserver_aggregator.h>
+#include <gnuradio/rpcserver_booter_base.h>
 #include <boost/shared_ptr.hpp>
 #include <string>
 

diff --git a/gnuradio-runtime/include/gnuradio/rpcserver_booter_thrift.h b/gnuradio-runtime/include/gnuradio/rpcserver_booter_thrift.h
@@ -23,9 +23,9 @@
 #ifndef RPCSERVER_BOOTER_THRIFT_H
 #define RPCSERVER_BOOTER_THRIFT_H
 
+#include "thrift/ControlPort.h"
 #include <gnuradio/rpcserver_booter_base.h>
 #include <gnuradio/thrift_server_template.h>
-#include "thrift/ControlPort.h"
 
 class rpcserver_base;
 class rpcserver_thrift;

diff --git a/gnuradio-runtime/include/gnuradio/rpcserver_thrift.h b/gnuradio-runtime/include/gnuradio/rpcserver_thrift.h
@@ -23,16 +23,16 @@
 #ifndef RPCSERVER_THRIFT_H
 #define RPCSERVER_THRIFT_H
 
-#include <gnuradio/rpcserver_base.h>
-#include <gnuradio/rpcpmtconverters_thrift.h>
-#include <string>
-#include <iostream>
-#include <sstream>
-#include <map>
 #include "thrift/ControlPort.h"
 #include "thrift/gnuradio_types.h"
+#include <gnuradio/rpcpmtconverters_thrift.h>
+#include <gnuradio/rpcserver_base.h>
 #include <boost/format.hpp>
 #include <boost/thread/mutex.hpp>
+#include <iostream>
+#include <map>
+#include <sstream>
+#include <string>
 
 #define S(x) #x
 #define S_(x) S(x)

diff --git a/gnuradio-runtime/include/gnuradio/tag_checker.h b/gnuradio-runtime/include/gnuradio/tag_checker.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_GR_RUNTIME_TAG_CHECKER_H
 #define INCLUDED_GR_RUNTIME_TAG_CHECKER_H
 
-#include <vector>
 #include <gnuradio/tags.h>
+#include <vector>
 
 namespace gr {
 

diff --git a/gnuradio-runtime/include/gnuradio/thread/thread.h b/gnuradio-runtime/include/gnuradio/thread/thread.h
@@ -23,12 +23,12 @@
 #define INCLUDED_THREAD_H
 
 #include <gnuradio/api.h>
-#include <boost/thread/thread.hpp>
-#include <boost/thread/mutex.hpp>
-#include <boost/thread/locks.hpp>
-#include <boost/thread/condition_variable.hpp>
-#include <boost/thread/barrier.hpp>
 #include <boost/shared_ptr.hpp>
+#include <boost/thread/barrier.hpp>
+#include <boost/thread/condition_variable.hpp>
+#include <boost/thread/locks.hpp>
+#include <boost/thread/mutex.hpp>
+#include <boost/thread/thread.hpp>
 #include <vector>
 
 #if defined(_WIN32) || defined(__WIN32__) || defined(WIN32)

diff --git a/gnuradio-runtime/include/gnuradio/thread/thread_group.h b/gnuradio-runtime/include/gnuradio/thread/thread_group.h
@@ -17,9 +17,9 @@
 
 #include <gnuradio/api.h>
 #include <gnuradio/thread/thread.h>
-#include <boost/utility.hpp>
-#include <boost/thread/shared_mutex.hpp>
 #include <boost/function.hpp>
+#include <boost/thread/shared_mutex.hpp>
+#include <boost/utility.hpp>
 
 namespace gr {
 namespace thread {

diff --git a/gnuradio-runtime/include/gnuradio/thrift_server_template.h b/gnuradio-runtime/include/gnuradio/thrift_server_template.h
@@ -23,18 +23,18 @@
 #ifndef THRIFT_SERVER_TEMPLATE_H
 #define THRIFT_SERVER_TEMPLATE_H
 
-#include <gnuradio/prefs.h>
 #include <gnuradio/logger.h>
+#include <gnuradio/prefs.h>
 #include <gnuradio/thrift_application_base.h>
 #include <iostream>
 
+#include "thrift/ControlPort.h"
+#include <thrift/concurrency/PlatformThreadFactory.h>
+#include <thrift/concurrency/ThreadManager.h>
 #include <thrift/server/TSimpleServer.h>
 #include <thrift/server/TThreadPoolServer.h>
-#include <thrift/concurrency/ThreadManager.h>
-#include <thrift/concurrency/PlatformThreadFactory.h>
-#include <thrift/transport/TServerSocket.h>
 #include <thrift/transport/TBufferTransports.h>
-#include "thrift/ControlPort.h"
+#include <thrift/transport/TServerSocket.h>
 
 using namespace apache;
 

diff --git a/gnuradio-runtime/include/gnuradio/tpb_detail.h b/gnuradio-runtime/include/gnuradio/tpb_detail.h
@@ -24,8 +24,8 @@
 
 #include <gnuradio/api.h>
 #include <gnuradio/thread/thread.h>
-#include <deque>
 #include <pmt/pmt.h>
+#include <deque>
 
 namespace gr {
 

diff --git a/gnuradio-runtime/include/gnuradio/types.h b/gnuradio-runtime/include/gnuradio/types.h
@@ -24,9 +24,9 @@
 #define INCLUDED_GR_TYPES_H
 
 #include <gnuradio/api.h>
+#include <stddef.h> // size_t
 #include <boost/shared_ptr.hpp>
 #include <vector>
-#include <stddef.h> // size_t
 
 #include <gnuradio/gr_complex.h>
 

diff --git a/gnuradio-runtime/include/gnuradio/unittests.h b/gnuradio-runtime/include/gnuradio/unittests.h
@@ -24,8 +24,8 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <sys/types.h>
 #include <sys/stat.h>
+#include <sys/types.h>
 #ifndef _MSC_VER
 #include <unistd.h>
 #endif

diff --git a/gnuradio-runtime/include/pmt/pmt.h b/gnuradio-runtime/include/pmt/pmt.h
@@ -24,14 +24,14 @@
 #define INCLUDED_PMT_H
 
 #include <pmt/api.h>
+#include <stdint.h>
+#include <boost/any.hpp>
 #include <boost/noncopyable.hpp>
 #include <boost/shared_ptr.hpp>
-#include <boost/any.hpp>
 #include <complex>
-#include <string>
-#include <stdint.h>
 #include <iosfwd>
 #include <stdexcept>
+#include <string>
 #include <vector>
 
 namespace gr {