diff options
| author | Marcus Müller <mmueller@gnuradio.org> | 2019-08-07 22:21:18 +0200 |
|---|---|---|
| committer | Marcus Müller <marcus@hostalia.de> | 2019-08-09 23:04:28 +0200 |
| commit | d24b0c8f1ebe1a9681271c014659bf2ecc613e50 (patch) | |
| tree | a18051dccba5266904571dce8a93128ad62e8453 /gnuradio-runtime/lib | |
| parent | 65599ad299f030d302386fcda9bc0e3175d9a828 (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 'gnuradio-runtime/lib')
63 files changed, 131 insertions, 133 deletions
diff --git a/gnuradio-runtime/lib/basic_block.cc b/gnuradio-runtime/lib/basic_block.cc index 60aaa86c46..bc16617657 100644 --- a/gnuradio-runtime/lib/basic_block.cc +++ b/gnuradio-runtime/lib/basic_block.cc @@ -27,9 +27,9 @@ #include <gnuradio/basic_block.h> #include <gnuradio/block_registry.h> #include <gnuradio/logger.h> -#include <stdexcept> -#include <sstream> #include <iostream> +#include <sstream> +#include <stdexcept> namespace gr { diff --git a/gnuradio-runtime/lib/block.cc b/gnuradio-runtime/lib/block.cc index 65399bfc3e..a09409708e 100644 --- a/gnuradio-runtime/lib/block.cc +++ b/gnuradio-runtime/lib/block.cc @@ -25,12 +25,12 @@ #endif #include <gnuradio/block.h> -#include <gnuradio/block_registry.h> #include <gnuradio/block_detail.h> +#include <gnuradio/block_registry.h> #include <gnuradio/buffer.h> #include <gnuradio/prefs.h> -#include <stdexcept> #include <iostream> +#include <stdexcept> namespace gr { diff --git a/gnuradio-runtime/lib/block_executor.cc b/gnuradio-runtime/lib/block_executor.cc index 9f0d7ded5e..eb08c84de4 100644 --- a/gnuradio-runtime/lib/block_executor.cc +++ b/gnuradio-runtime/lib/block_executor.cc @@ -24,17 +24,17 @@ #include "config.h" #endif -#include <block_executor.h> #include <gnuradio/block.h> #include <gnuradio/block_detail.h> #include <gnuradio/buffer.h> #include <gnuradio/prefs.h> -#include <boost/thread.hpp> +#include <assert.h> +#include <block_executor.h> +#include <stdio.h> #include <boost/format.hpp> +#include <boost/thread.hpp> #include <iostream> #include <limits> -#include <assert.h> -#include <stdio.h> namespace gr { diff --git a/gnuradio-runtime/lib/block_gateway_impl.cc b/gnuradio-runtime/lib/block_gateway_impl.cc index 67f9990c4a..7ccbeaddfc 100644 --- a/gnuradio-runtime/lib/block_gateway_impl.cc +++ b/gnuradio-runtime/lib/block_gateway_impl.cc @@ -21,8 +21,8 @@ #include "block_gateway_impl.h" #include <gnuradio/io_signature.h> -#include <iostream> #include <boost/bind.hpp> +#include <iostream> namespace gr { diff --git a/gnuradio-runtime/lib/buffer.cc b/gnuradio-runtime/lib/buffer.cc index e66e9ed6c6..cc9d991c95 100644 --- a/gnuradio-runtime/lib/buffer.cc +++ b/gnuradio-runtime/lib/buffer.cc @@ -23,14 +23,13 @@ #ifdef HAVE_CONFIG_H #include "config.h" #endif -#include <algorithm> +#include "vmcircbuf.h" #include <gnuradio/buffer.h> #include <gnuradio/math.h> -#include "vmcircbuf.h" -#include <stdexcept> -#include <iostream> #include <assert.h> #include <algorithm> +#include <iostream> +#include <stdexcept> // the following header is deprecated as of Boost 1.66.0, and the // other API was introduced in Boost 1.58.0. Since we still support diff --git a/gnuradio-runtime/lib/circular_file.cc b/gnuradio-runtime/lib/circular_file.cc index 3569baf280..dcfccf9af3 100644 --- a/gnuradio-runtime/lib/circular_file.cc +++ b/gnuradio-runtime/lib/circular_file.cc @@ -31,17 +31,17 @@ #include <sys/mman.h> #endif -#include <sys/types.h> -#include <sys/stat.h> -#include <unistd.h> +#include <assert.h> #include <fcntl.h> #include <stdio.h> -#include <assert.h> #include <stdlib.h> +#include <sys/stat.h> +#include <sys/types.h> +#include <unistd.h> -#include <algorithm> #include <stdio.h> #include <string.h> +#include <algorithm> #ifdef HAVE_IO_H #include <io.h> diff --git a/gnuradio-runtime/lib/controlport/rpcserver_selector.cc b/gnuradio-runtime/lib/controlport/rpcserver_selector.cc index 7d2453fd36..6c6c808089 100644 --- a/gnuradio-runtime/lib/controlport/rpcserver_selector.cc +++ b/gnuradio-runtime/lib/controlport/rpcserver_selector.cc @@ -20,8 +20,8 @@ * Boston, MA 02110-1301, USA. */ -#include <gnuradio/rpcserver_booter_aggregator.h> #include <gnuradio/rpcmanager.h> +#include <gnuradio/rpcserver_booter_aggregator.h> #include <gnuradio/rpcserver_selector.h> bool rpcmanager::make_aggregator(false); diff --git a/gnuradio-runtime/lib/controlport/thrift/rpcpmtconverters_thrift.cc b/gnuradio-runtime/lib/controlport/thrift/rpcpmtconverters_thrift.cc index 05bb936f5a..73846733b7 100644 --- a/gnuradio-runtime/lib/controlport/thrift/rpcpmtconverters_thrift.cc +++ b/gnuradio-runtime/lib/controlport/thrift/rpcpmtconverters_thrift.cc @@ -19,10 +19,10 @@ * Boston, MA 02110-1301, USA. */ -#include <boost/assign/ptr_map_inserter.hpp> -#include <gnuradio/rpcpmtconverters_thrift.h> -#include <gnuradio/gr_complex.h> #include "thrift/gnuradio_types.h" +#include <gnuradio/gr_complex.h> +#include <gnuradio/rpcpmtconverters_thrift.h> +#include <boost/assign/ptr_map_inserter.hpp> #include <iostream> GNURadio::Knob rpcpmtconverter::from_pmt(const pmt::pmt_t& knob) diff --git a/gnuradio-runtime/lib/controlport/thrift/rpcserver_booter_thrift.cc b/gnuradio-runtime/lib/controlport/thrift/rpcserver_booter_thrift.cc index a5017cd17a..fd63330e1b 100644 --- a/gnuradio-runtime/lib/controlport/thrift/rpcserver_booter_thrift.cc +++ b/gnuradio-runtime/lib/controlport/thrift/rpcserver_booter_thrift.cc @@ -20,8 +20,8 @@ * Boston, MA 02110-1301, USA. */ -#include <gnuradio/rpcserver_thrift.h> #include <gnuradio/rpcserver_booter_thrift.h> +#include <gnuradio/rpcserver_thrift.h> #include <boost/asio/ip/host_name.hpp> diff --git a/gnuradio-runtime/lib/controlport/thrift/rpcserver_thrift.cc b/gnuradio-runtime/lib/controlport/thrift/rpcserver_thrift.cc index 180bb85f3d..6b715f1082 100644 --- a/gnuradio-runtime/lib/controlport/thrift/rpcserver_thrift.cc +++ b/gnuradio-runtime/lib/controlport/thrift/rpcserver_thrift.cc @@ -20,16 +20,16 @@ * Boston, MA 02110-1301, USA. */ +#include "thrift/ControlPort.h" #include <gnuradio/rpcserver_thrift.h> -#include <iostream> -#include <sstream> -#include <stdexcept> #include <pmt/pmt.h> #include <thrift/protocol/TBinaryProtocol.h> #include <thrift/transport/TSocket.h> #include <thrift/transport/TTransportUtils.h> #include <boost/xpressive/xpressive.hpp> -#include "thrift/ControlPort.h" +#include <iostream> +#include <sstream> +#include <stdexcept> #define DEBUG 0 diff --git a/gnuradio-runtime/lib/flat_flowgraph.cc b/gnuradio-runtime/lib/flat_flowgraph.cc index b798e4812e..a41d150e23 100644 --- a/gnuradio-runtime/lib/flat_flowgraph.cc +++ b/gnuradio-runtime/lib/flat_flowgraph.cc @@ -30,9 +30,9 @@ #include <gnuradio/logger.h> #include <gnuradio/prefs.h> #include <volk/volk.h> +#include <boost/format.hpp> #include <iostream> #include <map> -#include <boost/format.hpp> namespace gr { diff --git a/gnuradio-runtime/lib/flat_flowgraph.h b/gnuradio-runtime/lib/flat_flowgraph.h index 3630a2a5c8..75082349e2 100644 --- a/gnuradio-runtime/lib/flat_flowgraph.h +++ b/gnuradio-runtime/lib/flat_flowgraph.h @@ -24,8 +24,8 @@ #define INCLUDED_GR_RUNTIME_FLAT_FLOWGRAPH_H #include <gnuradio/api.h> -#include <gnuradio/flowgraph.h> #include <gnuradio/block.h> +#include <gnuradio/flowgraph.h> #include <gnuradio/logger.h> namespace gr { diff --git a/gnuradio-runtime/lib/flowgraph.cc b/gnuradio-runtime/lib/flowgraph.cc index acc1429ae2..11c816f79f 100644 --- a/gnuradio-runtime/lib/flowgraph.cc +++ b/gnuradio-runtime/lib/flowgraph.cc @@ -25,9 +25,9 @@ #endif #include <gnuradio/flowgraph.h> -#include <stdexcept> -#include <sstream> #include <iterator> +#include <sstream> +#include <stdexcept> namespace gr { diff --git a/gnuradio-runtime/lib/hier_block2.cc b/gnuradio-runtime/lib/hier_block2.cc index 4c6414c465..755977c841 100644 --- a/gnuradio-runtime/lib/hier_block2.cc +++ b/gnuradio-runtime/lib/hier_block2.cc @@ -24,10 +24,10 @@ #include "config.h" #endif +#include "hier_block2_detail.h" +#include <gnuradio/flowgraph.h> #include <gnuradio/hier_block2.h> #include <gnuradio/io_signature.h> -#include <gnuradio/flowgraph.h> -#include "hier_block2_detail.h" #include <iostream> namespace gr { diff --git a/gnuradio-runtime/lib/hier_block2_detail.cc b/gnuradio-runtime/lib/hier_block2_detail.cc index 38925330cb..59f290bf99 100644 --- a/gnuradio-runtime/lib/hier_block2_detail.cc +++ b/gnuradio-runtime/lib/hier_block2_detail.cc @@ -27,9 +27,9 @@ #include "hier_block2_detail.h" #include <gnuradio/io_signature.h> #include <gnuradio/prefs.h> -#include <stdexcept> -#include <sstream> #include <boost/format.hpp> +#include <sstream> +#include <stdexcept> namespace gr { diff --git a/gnuradio-runtime/lib/io_signature.cc b/gnuradio-runtime/lib/io_signature.cc index 7e9aefc2a7..d5bb427ab8 100644 --- a/gnuradio-runtime/lib/io_signature.cc +++ b/gnuradio-runtime/lib/io_signature.cc @@ -25,8 +25,8 @@ #endif #include <gnuradio/io_signature.h> -#include <stdexcept> #include <iostream> +#include <stdexcept> namespace gr { diff --git a/gnuradio-runtime/lib/local_sighandler.cc b/gnuradio-runtime/lib/local_sighandler.cc index 4f3083b3ed..97491b24de 100644 --- a/gnuradio-runtime/lib/local_sighandler.cc +++ b/gnuradio-runtime/lib/local_sighandler.cc @@ -25,9 +25,9 @@ #endif #include "local_sighandler.h" -#include <stdexcept> #include <stdio.h> #include <string.h> +#include <stdexcept> namespace gr { diff --git a/gnuradio-runtime/lib/logger.cc b/gnuradio-runtime/lib/logger.cc index f3fa86b30a..6aab82b603 100644 --- a/gnuradio-runtime/lib/logger.cc +++ b/gnuradio-runtime/lib/logger.cc @@ -32,8 +32,8 @@ #include <gnuradio/logger.h> #include <gnuradio/prefs.h> -#include <stdexcept> #include <algorithm> +#include <stdexcept> namespace gr { diff --git a/gnuradio-runtime/lib/math/qa_fxpt.cc b/gnuradio-runtime/lib/math/qa_fxpt.cc index 16e04b819a..d54c873846 100644 --- a/gnuradio-runtime/lib/math/qa_fxpt.cc +++ b/gnuradio-runtime/lib/math/qa_fxpt.cc @@ -26,11 +26,11 @@ #include <gnuradio/fxpt.h> #include <gnuradio/math.h> -#include <boost/test/unit_test.hpp> -#include <iostream> +#include <math.h> #include <stdio.h> #include <unistd.h> -#include <math.h> +#include <boost/test/unit_test.hpp> +#include <iostream> static const float SIN_COS_TOLERANCE = 1e-5; diff --git a/gnuradio-runtime/lib/math/qa_fxpt_nco.cc b/gnuradio-runtime/lib/math/qa_fxpt_nco.cc index 2c4a8c327a..4dc22fcf9a 100644 --- a/gnuradio-runtime/lib/math/qa_fxpt_nco.cc +++ b/gnuradio-runtime/lib/math/qa_fxpt_nco.cc @@ -26,11 +26,11 @@ #include <gnuradio/fxpt_nco.h> #include <gnuradio/nco.h> -#include <boost/test/unit_test.hpp> -#include <iostream> +#include <math.h> #include <stdio.h> #include <unistd.h> -#include <math.h> +#include <boost/test/unit_test.hpp> +#include <iostream> static const float SIN_COS_TOLERANCE = 1e-5; diff --git a/gnuradio-runtime/lib/math/qa_fxpt_vco.cc b/gnuradio-runtime/lib/math/qa_fxpt_vco.cc index a24e38d63b..202f2da0bf 100644 --- a/gnuradio-runtime/lib/math/qa_fxpt_vco.cc +++ b/gnuradio-runtime/lib/math/qa_fxpt_vco.cc @@ -26,11 +26,11 @@ #include "vco.h" #include <gnuradio/fxpt_vco.h> -#include <boost/test/unit_test.hpp> -#include <iostream> +#include <math.h> #include <stdio.h> #include <unistd.h> -#include <math.h> +#include <boost/test/unit_test.hpp> +#include <iostream> static const float SIN_COS_TOLERANCE = 1e-5; diff --git a/gnuradio-runtime/lib/math/qa_math.cc b/gnuradio-runtime/lib/math/qa_math.cc index 46833286e9..da129987c2 100644 --- a/gnuradio-runtime/lib/math/qa_math.cc +++ b/gnuradio-runtime/lib/math/qa_math.cc @@ -20,8 +20,8 @@ */ #include <gnuradio/math.h> -#include <boost/test/unit_test.hpp> #include <stdio.h> +#include <boost/test/unit_test.hpp> #include <cmath> BOOST_AUTO_TEST_CASE(test_binary_slicer1) diff --git a/gnuradio-runtime/lib/math/random.cc b/gnuradio-runtime/lib/math/random.cc index 9e30c94399..223e9141fe 100644 --- a/gnuradio-runtime/lib/math/random.cc +++ b/gnuradio-runtime/lib/math/random.cc @@ -39,8 +39,8 @@ #include <config.h> #endif -#include <gnuradio/random.h> #include <gnuradio/math.h> +#include <gnuradio/random.h> #include <cmath> diff --git a/gnuradio-runtime/lib/math/vco.h b/gnuradio-runtime/lib/math/vco.h index 1687de6af7..05ca3b9c41 100644 --- a/gnuradio-runtime/lib/math/vco.h +++ b/gnuradio-runtime/lib/math/vco.h @@ -23,12 +23,12 @@ #ifndef _GR_VCO_H_ #define _GR_VCO_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/lib/msg_accepter.cc b/gnuradio-runtime/lib/msg_accepter.cc index 77870ad498..2ba41b300b 100644 --- a/gnuradio-runtime/lib/msg_accepter.cc +++ b/gnuradio-runtime/lib/msg_accepter.cc @@ -23,10 +23,10 @@ #include <config.h> #endif -#include <gnuradio/msg_accepter.h> #include <gnuradio/block.h> #include <gnuradio/block_detail.h> #include <gnuradio/hier_block2.h> +#include <gnuradio/msg_accepter.h> #include <stdexcept> namespace gr { diff --git a/gnuradio-runtime/lib/pagesize.cc b/gnuradio-runtime/lib/pagesize.cc index 3a58c3d8d7..d03069ccf8 100644 --- a/gnuradio-runtime/lib/pagesize.cc +++ b/gnuradio-runtime/lib/pagesize.cc @@ -25,8 +25,8 @@ #endif #include "pagesize.h" -#include <unistd.h> #include <stdio.h> +#include <unistd.h> namespace gr { diff --git a/gnuradio-runtime/lib/pmt/pmt.cc b/gnuradio-runtime/lib/pmt/pmt.cc index 4adb763e5f..67e1f557e8 100644 --- a/gnuradio-runtime/lib/pmt/pmt.cc +++ b/gnuradio-runtime/lib/pmt/pmt.cc @@ -24,13 +24,13 @@ #include <config.h> #endif -#include <vector> -#include <pmt/pmt.h> #include "pmt_int.h" #include <gnuradio/messages/msg_accepter.h> +#include <pmt/pmt.h> #include <pmt/pmt_pool.h> #include <stdio.h> #include <string.h> +#include <vector> namespace pmt { diff --git a/gnuradio-runtime/lib/pmt/pmt_int.h b/gnuradio-runtime/lib/pmt/pmt_int.h index ea3dd5e2c9..4be2391c30 100644 --- a/gnuradio-runtime/lib/pmt/pmt_int.h +++ b/gnuradio-runtime/lib/pmt/pmt_int.h @@ -23,9 +23,9 @@ #define INCLUDED_PMT_INT_H #include <pmt/pmt.h> +#include <boost/atomic.hpp> #include <boost/utility.hpp> #include <boost/version.hpp> -#include <boost/atomic.hpp> /* * EVERYTHING IN THIS FILE IS PRIVATE TO THE IMPLEMENTATION! diff --git a/gnuradio-runtime/lib/pmt/pmt_io.cc b/gnuradio-runtime/lib/pmt/pmt_io.cc index 2c39a0872f..09c0a54e2a 100644 --- a/gnuradio-runtime/lib/pmt/pmt_io.cc +++ b/gnuradio-runtime/lib/pmt/pmt_io.cc @@ -23,11 +23,11 @@ #include <config.h> #endif -#include <vector> -#include <pmt/pmt.h> #include "pmt_int.h" -#include <sstream> +#include <pmt/pmt.h> #include <iostream> +#include <sstream> +#include <vector> namespace pmt { diff --git a/gnuradio-runtime/lib/pmt/pmt_pool.cc b/gnuradio-runtime/lib/pmt/pmt_pool.cc index 066d31296f..3334e7c529 100644 --- a/gnuradio-runtime/lib/pmt/pmt_pool.cc +++ b/gnuradio-runtime/lib/pmt/pmt_pool.cc @@ -24,8 +24,8 @@ #endif #include <pmt/pmt_pool.h> -#include <algorithm> #include <stdint.h> +#include <algorithm> namespace pmt { diff --git a/gnuradio-runtime/lib/pmt/pmt_serialize.cc b/gnuradio-runtime/lib/pmt/pmt_serialize.cc index 4f77c0378a..150f8fa1e5 100644 --- a/gnuradio-runtime/lib/pmt/pmt_serialize.cc +++ b/gnuradio-runtime/lib/pmt/pmt_serialize.cc @@ -23,11 +23,11 @@ #include <config.h> #endif -#include <vector> -#include <limits> -#include <pmt/pmt.h> -#include "pmt_int.h" #include "pmt/pmt_serial_tags.h" +#include "pmt_int.h" +#include <pmt/pmt.h> +#include <limits> +#include <vector> namespace pmt { diff --git a/gnuradio-runtime/lib/pmt/pmt_unv.cc b/gnuradio-runtime/lib/pmt/pmt_unv.cc index fc295fb6b3..d6c38165e0 100644 --- a/gnuradio-runtime/lib/pmt/pmt_unv.cc +++ b/gnuradio-runtime/lib/pmt/pmt_unv.cc @@ -26,8 +26,8 @@ #include <config.h> #endif -#include "pmt_unv_int.h" #include "pmt_int.h" +#include "pmt_unv_int.h" #include <pmt/pmt.h> #include <boost/lexical_cast.hpp> #include <vector> diff --git a/gnuradio-runtime/lib/pmt/pmt_unv_int.h b/gnuradio-runtime/lib/pmt/pmt_unv_int.h index c2e2617f63..d48d834636 100644 --- a/gnuradio-runtime/lib/pmt/pmt_unv_int.h +++ b/gnuradio-runtime/lib/pmt/pmt_unv_int.h @@ -25,8 +25,8 @@ #include "pmt_int.h" -#include <vector> #include <cstdint> +#include <vector> namespace pmt { //////////////////////////////////////////////////////////////////////////// diff --git a/gnuradio-runtime/lib/pmt/qa_pmt_prims.cc b/gnuradio-runtime/lib/pmt/qa_pmt_prims.cc index b715d69df4..ccaf807a61 100644 --- a/gnuradio-runtime/lib/pmt/qa_pmt_prims.cc +++ b/gnuradio-runtime/lib/pmt/qa_pmt_prims.cc @@ -20,10 +20,10 @@ * Boston, MA 02110-1301, USA. */ -#include <pmt/api.h> //reason: suppress warnings #include <gnuradio/messages/msg_passing.h> -#include <boost/test/unit_test.hpp> +#include <pmt/api.h> //reason: suppress warnings #include <boost/format.hpp> +#include <boost/test/unit_test.hpp> #include <cstdio> #include <cstring> #include <sstream> diff --git a/gnuradio-runtime/lib/pmt/qa_pmt_unv.cc b/gnuradio-runtime/lib/pmt/qa_pmt_unv.cc index 9dd9452e5e..8a6d72f9a3 100644 --- a/gnuradio-runtime/lib/pmt/qa_pmt_unv.cc +++ b/gnuradio-runtime/lib/pmt/qa_pmt_unv.cc @@ -20,14 +20,14 @@ * Boston, MA 02110-1301, USA. */ +#include <gnuradio/messages/msg_passing.h> #include <pmt/api.h> //reason: suppress warnings #include <pmt/pmt.h> -#include <gnuradio/messages/msg_passing.h> -#include <boost/test/unit_test.hpp> #include <boost/format.hpp> -#include <sstream> +#include <boost/test/unit_test.hpp> #include <cstdio> #include <cstring> +#include <sstream> using namespace pmt; diff --git a/gnuradio-runtime/lib/prefs.cc b/gnuradio-runtime/lib/prefs.cc index 218926d312..a17e51bbef 100644 --- a/gnuradio-runtime/lib/prefs.cc +++ b/gnuradio-runtime/lib/prefs.cc @@ -24,19 +24,19 @@ #include <config.h> #endif +#include <gnuradio/constants.h> #include <gnuradio/prefs.h> #include <gnuradio/sys_paths.h> -#include <gnuradio/constants.h> #include <algorithm> #include <fstream> #include <iostream> +#include <boost/filesystem/fstream.hpp> #include <boost/filesystem/operations.hpp> #include <boost/filesystem/path.hpp> -#include <boost/filesystem/fstream.hpp> -#include <boost/program_options.hpp> #include <boost/foreach.hpp> +#include <boost/program_options.hpp> namespace fs = boost::filesystem; namespace po = boost::program_options; typedef std::ifstream::char_type char_t; diff --git a/gnuradio-runtime/lib/qa_buffer.cc b/gnuradio-runtime/lib/qa_buffer.cc index 64b1d0fc1f..1b8e4db306 100644 --- a/gnuradio-runtime/lib/qa_buffer.cc +++ b/gnuradio-runtime/lib/qa_buffer.cc @@ -25,10 +25,10 @@ #endif -#include <gnuradio/random.h> #include <gnuradio/buffer.h> -#include <boost/test/unit_test.hpp> +#include <gnuradio/random.h> #include <stdlib.h> +#include <boost/test/unit_test.hpp> static void leak_check(void f()) diff --git a/gnuradio-runtime/lib/qa_circular_file.cc b/gnuradio-runtime/lib/qa_circular_file.cc index 164650819d..53c98e9f87 100644 --- a/gnuradio-runtime/lib/qa_circular_file.cc +++ b/gnuradio-runtime/lib/qa_circular_file.cc @@ -25,8 +25,8 @@ #endif #include "circular_file.h" -#include <boost/test/unit_test.hpp> #include <unistd.h> +#include <boost/test/unit_test.hpp> static const char* test_file = "qa_gr_circular_file.data"; static const int BUFFER_SIZE = 8192; diff --git a/gnuradio-runtime/lib/realtime_impl.cc b/gnuradio-runtime/lib/realtime_impl.cc index de624f9ad7..f97d3b757e 100644 --- a/gnuradio-runtime/lib/realtime_impl.cc +++ b/gnuradio-runtime/lib/realtime_impl.cc @@ -30,11 +30,11 @@ #include <sched.h> #endif -#include <algorithm> -#include <math.h> -#include <string.h> #include <errno.h> +#include <math.h> #include <stdio.h> +#include <string.h> +#include <algorithm> #include <iostream> diff --git a/gnuradio-runtime/lib/scheduler.h b/gnuradio-runtime/lib/scheduler.h index 36bec12961..8041771f3c 100644 --- a/gnuradio-runtime/lib/scheduler.h +++ b/gnuradio-runtime/lib/scheduler.h @@ -22,10 +22,10 @@ #ifndef INCLUDED_GR_SCHEDULER_H #define INCLUDED_GR_SCHEDULER_H +#include "flat_flowgraph.h" #include <gnuradio/api.h> -#include <boost/utility.hpp> #include <gnuradio/block.h> -#include "flat_flowgraph.h" +#include <boost/utility.hpp> namespace gr { diff --git a/gnuradio-runtime/lib/scheduler_tpb.h b/gnuradio-runtime/lib/scheduler_tpb.h index a353d1aae0..152b11c8f3 100644 --- a/gnuradio-runtime/lib/scheduler_tpb.h +++ b/gnuradio-runtime/lib/scheduler_tpb.h @@ -22,9 +22,9 @@ #ifndef INCLUDED_GR_SCHEDULER_TPB_H #define INCLUDED_GR_SCHEDULER_TPB_H +#include "scheduler.h" #include <gnuradio/api.h> #include <gnuradio/thread/thread_group.h> -#include "scheduler.h" namespace gr { diff --git a/gnuradio-runtime/lib/sptr_magic.cc b/gnuradio-runtime/lib/sptr_magic.cc index 03693cdc8f..c55bee7427 100644 --- a/gnuradio-runtime/lib/sptr_magic.cc +++ b/gnuradio-runtime/lib/sptr_magic.cc @@ -23,8 +23,8 @@ #include <config.h> #endif -#include <gnuradio/sptr_magic.h> #include <gnuradio/hier_block2.h> +#include <gnuradio/sptr_magic.h> #include <map> #include <stdexcept> diff --git a/gnuradio-runtime/lib/sys_paths.cc b/gnuradio-runtime/lib/sys_paths.cc index 068a38a51d..6305bb40bc 100644 --- a/gnuradio-runtime/lib/sys_paths.cc +++ b/gnuradio-runtime/lib/sys_paths.cc @@ -20,8 +20,8 @@ */ #include <gnuradio/sys_paths.h> -#include <cstdlib> //getenv #include <cstdio> //P_tmpdir (maybe) +#include <cstdlib> //getenv #include <boost/filesystem/path.hpp> diff --git a/gnuradio-runtime/lib/tagged_stream_block.cc b/gnuradio-runtime/lib/tagged_stream_block.cc index 1617bb3698..da4165b55d 100644 --- a/gnuradio-runtime/lib/tagged_stream_block.cc +++ b/gnuradio-runtime/lib/tagged_stream_block.cc @@ -24,8 +24,8 @@ #include "config.h" #endif -#include <boost/format.hpp> #include <gnuradio/tagged_stream_block.h> +#include <boost/format.hpp> namespace gr { diff --git a/gnuradio-runtime/lib/test.cc b/gnuradio-runtime/lib/test.cc index 04fe8a30d6..0a2176c24d 100644 --- a/gnuradio-runtime/lib/test.cc +++ b/gnuradio-runtime/lib/test.cc @@ -26,9 +26,9 @@ #include "test.h" #include <gnuradio/io_signature.h> -#include <stdexcept> -#include <iostream> #include <string.h> +#include <iostream> +#include <stdexcept> namespace gr { diff --git a/gnuradio-runtime/lib/test.h b/gnuradio-runtime/lib/test.h index 51e17ac49a..ebaea13cfa 100644 --- a/gnuradio-runtime/lib/test.h +++ b/gnuradio-runtime/lib/test.h @@ -23,10 +23,10 @@ #ifndef INCLUDED_GR_TEST_H #define INCLUDED_GR_TEST_H +#include "test_types.h" #include <gnuradio/api.h> #include <gnuradio/block.h> #include <string> -#include "test_types.h" namespace gr { diff --git a/gnuradio-runtime/lib/thread/thread.cc b/gnuradio-runtime/lib/thread/thread.cc index 85240cbee1..15d433d62d 100644 --- a/gnuradio-runtime/lib/thread/thread.cc +++ b/gnuradio-runtime/lib/thread/thread.cc @@ -218,10 +218,10 @@ void set_thread_name(gr_thread_t thread, std::string name) #else -#include <sstream> -#include <stdexcept> #include <pthread.h> #include <sys/prctl.h> +#include <sstream> +#include <stdexcept> namespace gr { namespace thread { diff --git a/gnuradio-runtime/lib/top_block.cc b/gnuradio-runtime/lib/top_block.cc index fa3902c735..92f4cb7786 100644 --- a/gnuradio-runtime/lib/top_block.cc +++ b/gnuradio-runtime/lib/top_block.cc @@ -25,10 +25,10 @@ #endif #include "top_block_impl.h" -#include <gnuradio/top_block.h> +#include <gnuradio/high_res_timer.h> #include <gnuradio/io_signature.h> #include <gnuradio/prefs.h> -#include <gnuradio/high_res_timer.h> +#include <gnuradio/top_block.h> #include <unistd.h> #include <iostream> diff --git a/gnuradio-runtime/lib/top_block_impl.cc b/gnuradio-runtime/lib/top_block_impl.cc index 70b1e3e87c..16acb3826d 100644 --- a/gnuradio-runtime/lib/top_block_impl.cc +++ b/gnuradio-runtime/lib/top_block_impl.cc @@ -24,17 +24,17 @@ #include "config.h" #endif -#include "top_block_impl.h" #include "flat_flowgraph.h" #include "scheduler_tpb.h" -#include <gnuradio/top_block.h> +#include "top_block_impl.h" #include <gnuradio/prefs.h> +#include <gnuradio/top_block.h> -#include <stdexcept> -#include <iostream> +#include <stdlib.h> #include <string.h> #include <unistd.h> -#include <stdlib.h> +#include <iostream> +#include <stdexcept> namespace gr { diff --git a/gnuradio-runtime/lib/top_block_impl.h b/gnuradio-runtime/lib/top_block_impl.h index d31be2fac2..84611b3f85 100644 --- a/gnuradio-runtime/lib/top_block_impl.h +++ b/gnuradio-runtime/lib/top_block_impl.h @@ -23,8 +23,8 @@ #ifndef INCLUDED_GR_TOP_BLOCK_IMPL_H #define INCLUDED_GR_TOP_BLOCK_IMPL_H -#include <gnuradio/api.h> #include "scheduler.h" +#include <gnuradio/api.h> #include <gnuradio/thread/thread.h> namespace gr { diff --git a/gnuradio-runtime/lib/tpb_detail.cc b/gnuradio-runtime/lib/tpb_detail.cc index f5963fc491..1d354082a0 100644 --- a/gnuradio-runtime/lib/tpb_detail.cc +++ b/gnuradio-runtime/lib/tpb_detail.cc @@ -23,10 +23,10 @@ #include <config.h> #endif -#include <gnuradio/tpb_detail.h> #include <gnuradio/block.h> #include <gnuradio/block_detail.h> #include <gnuradio/buffer.h> +#include <gnuradio/tpb_detail.h> namespace gr { diff --git a/gnuradio-runtime/lib/tpb_thread_body.cc b/gnuradio-runtime/lib/tpb_thread_body.cc index e40c6df16b..ff70ae197f 100644 --- a/gnuradio-runtime/lib/tpb_thread_body.cc +++ b/gnuradio-runtime/lib/tpb_thread_body.cc @@ -25,9 +25,9 @@ #include "tpb_thread_body.h" #include <gnuradio/prefs.h> -#include <boost/thread.hpp> -#include <boost/foreach.hpp> #include <pmt/pmt.h> +#include <boost/foreach.hpp> +#include <boost/thread.hpp> #include <iostream> namespace gr { diff --git a/gnuradio-runtime/lib/tpb_thread_body.h b/gnuradio-runtime/lib/tpb_thread_body.h index c919612281..e5342d5f70 100644 --- a/gnuradio-runtime/lib/tpb_thread_body.h +++ b/gnuradio-runtime/lib/tpb_thread_body.h @@ -21,11 +21,11 @@ #ifndef INCLUDED_GR_TPB_THREAD_BODY_H #define INCLUDED_GR_TPB_THREAD_BODY_H +#include "block_executor.h" #include <gnuradio/api.h> #include <gnuradio/block.h> #include <gnuradio/block_detail.h> #include <gnuradio/thread/thread.h> -#include "block_executor.h" namespace gr { diff --git a/gnuradio-runtime/lib/vmcircbuf.cc b/gnuradio-runtime/lib/vmcircbuf.cc index 59e6187b27..3f17b0ab6d 100644 --- a/gnuradio-runtime/lib/vmcircbuf.cc +++ b/gnuradio-runtime/lib/vmcircbuf.cc @@ -24,21 +24,21 @@ #include "config.h" #endif +#include "local_sighandler.h" +#include "vmcircbuf.h" +#include "vmcircbuf_prefs.h" #include <assert.h> -#include <stdexcept> #include <stdio.h> #include <string.h> -#include <vector> #include <boost/format.hpp> -#include "vmcircbuf.h" -#include "vmcircbuf_prefs.h" -#include "local_sighandler.h" +#include <stdexcept> +#include <vector> // all the factories we know about #include "vmcircbuf_createfilemapping.h" -#include "vmcircbuf_sysv_shm.h" #include "vmcircbuf_mmap_shm_open.h" #include "vmcircbuf_mmap_tmpfile.h" +#include "vmcircbuf_sysv_shm.h" gr::thread::mutex s_vm_mutex; diff --git a/gnuradio-runtime/lib/vmcircbuf_createfilemapping.cc b/gnuradio-runtime/lib/vmcircbuf_createfilemapping.cc index b215fcfa6a..55f8daace8 100644 --- a/gnuradio-runtime/lib/vmcircbuf_createfilemapping.cc +++ b/gnuradio-runtime/lib/vmcircbuf_createfilemapping.cc @@ -24,20 +24,20 @@ #include "config.h" #endif -#include <stdexcept> #include <assert.h> -#include <unistd.h> #include <fcntl.h> +#include <unistd.h> +#include <stdexcept> #ifdef HAVE_SYS_TYPES_H #include <sys/types.h> #endif #ifdef HAVE_SYS_MMAN_H #include <sys/mman.h> #endif -#include <errno.h> -#include <stdio.h> #include "pagesize.h" #include "vmcircbuf_createfilemapping.h" +#include <errno.h> +#include <stdio.h> #include <boost/format.hpp> namespace gr { diff --git a/gnuradio-runtime/lib/vmcircbuf_createfilemapping.h b/gnuradio-runtime/lib/vmcircbuf_createfilemapping.h index f289abcd96..e7c4b724b1 100644 --- a/gnuradio-runtime/lib/vmcircbuf_createfilemapping.h +++ b/gnuradio-runtime/lib/vmcircbuf_createfilemapping.h @@ -23,8 +23,8 @@ #ifndef GR_VMCIRCBUF_CREATEFILEMAPPING_H #define GR_VMCIRCBUF_CREATEFILEMAPPING_H -#include <gnuradio/api.h> #include "vmcircbuf.h" +#include <gnuradio/api.h> #ifdef HAVE_CREATEFILEMAPPING #include <windows.h> diff --git a/gnuradio-runtime/lib/vmcircbuf_mmap_shm_open.cc b/gnuradio-runtime/lib/vmcircbuf_mmap_shm_open.cc index 3eef159d73..94f0a26f11 100644 --- a/gnuradio-runtime/lib/vmcircbuf_mmap_shm_open.cc +++ b/gnuradio-runtime/lib/vmcircbuf_mmap_shm_open.cc @@ -25,20 +25,20 @@ #endif #include "vmcircbuf_mmap_shm_open.h" -#include <stdexcept> #include <assert.h> -#include <unistd.h> #include <fcntl.h> +#include <unistd.h> +#include <stdexcept> #ifdef HAVE_SYS_TYPES_H #include <sys/types.h> #endif #ifdef HAVE_SYS_MMAN_H #include <sys/mman.h> #endif -#include <errno.h> -#include <stdio.h> #include "pagesize.h" #include <gnuradio/sys_paths.h> +#include <errno.h> +#include <stdio.h> namespace gr { diff --git a/gnuradio-runtime/lib/vmcircbuf_mmap_shm_open.h b/gnuradio-runtime/lib/vmcircbuf_mmap_shm_open.h index d0171e6c83..d3cbe4f018 100644 --- a/gnuradio-runtime/lib/vmcircbuf_mmap_shm_open.h +++ b/gnuradio-runtime/lib/vmcircbuf_mmap_shm_open.h @@ -23,8 +23,8 @@ #ifndef GR_VMCIRCBUF_MMAP_SHM_OPEN_H #define GR_VMCIRCBUF_MMAP_SHM_OPEN_H -#include <gnuradio/api.h> #include "vmcircbuf.h" +#include <gnuradio/api.h> namespace gr { diff --git a/gnuradio-runtime/lib/vmcircbuf_mmap_tmpfile.cc b/gnuradio-runtime/lib/vmcircbuf_mmap_tmpfile.cc index d9eec36df4..ec5f320ab1 100644 --- a/gnuradio-runtime/lib/vmcircbuf_mmap_tmpfile.cc +++ b/gnuradio-runtime/lib/vmcircbuf_mmap_tmpfile.cc @@ -25,22 +25,22 @@ #endif #include "vmcircbuf_mmap_tmpfile.h" -#include <stdexcept> #include <assert.h> -#include <unistd.h> #include <stdlib.h> +#include <unistd.h> +#include <stdexcept> #ifdef HAVE_SYS_TYPES_H #include <sys/types.h> #endif #ifdef HAVE_SYS_MMAN_H #include <sys/mman.h> #endif -#include <fcntl.h> +#include "pagesize.h" +#include <gnuradio/sys_paths.h> #include <errno.h> +#include <fcntl.h> #include <stdio.h> #include <string.h> -#include "pagesize.h" -#include <gnuradio/sys_paths.h> namespace gr { diff --git a/gnuradio-runtime/lib/vmcircbuf_mmap_tmpfile.h b/gnuradio-runtime/lib/vmcircbuf_mmap_tmpfile.h index 4f4ae64090..e2a9ddc51a 100644 --- a/gnuradio-runtime/lib/vmcircbuf_mmap_tmpfile.h +++ b/gnuradio-runtime/lib/vmcircbuf_mmap_tmpfile.h @@ -23,8 +23,8 @@ #ifndef GR_VMCIRCBUF_MMAP_TMPFILE_H #define GR_VMCIRCBUF_MMAP_TMPFILE_H -#include <gnuradio/api.h> #include "vmcircbuf.h" +#include <gnuradio/api.h> namespace gr { diff --git a/gnuradio-runtime/lib/vmcircbuf_prefs.cc b/gnuradio-runtime/lib/vmcircbuf_prefs.cc index 80c36f189f..3ff3e5af30 100644 --- a/gnuradio-runtime/lib/vmcircbuf_prefs.cc +++ b/gnuradio-runtime/lib/vmcircbuf_prefs.cc @@ -24,16 +24,15 @@ #include "config.h" #endif -#include "vmcircbuf_prefs.h" #include "vmcircbuf.h" +#include "vmcircbuf_prefs.h" #include <gnuradio/sys_paths.h> #include <stdio.h> #include <stdlib.h> #include <string.h> -#include <sys/types.h> #include <sys/stat.h> +#include <sys/types.h> #include <unistd.h> -#include <string.h> #include <boost/filesystem/operations.hpp> #include <boost/filesystem/path.hpp> diff --git a/gnuradio-runtime/lib/vmcircbuf_sysv_shm.cc b/gnuradio-runtime/lib/vmcircbuf_sysv_shm.cc index 7f1ccd2d7b..92e627f78b 100644 --- a/gnuradio-runtime/lib/vmcircbuf_sysv_shm.cc +++ b/gnuradio-runtime/lib/vmcircbuf_sysv_shm.cc @@ -25,20 +25,20 @@ #endif #include "vmcircbuf_sysv_shm.h" -#include <stdexcept> #include <assert.h> -#include <unistd.h> -#include <stdlib.h> #include <fcntl.h> +#include <stdlib.h> +#include <unistd.h> +#include <stdexcept> #ifdef HAVE_SYS_IPC_H #include <sys/ipc.h> #endif #ifdef HAVE_SYS_SHM_H #include <sys/shm.h> #endif +#include "pagesize.h" #include <errno.h> #include <stdio.h> -#include "pagesize.h" #define MAX_SYSV_SHM_ATTEMPTS 3 diff --git a/gnuradio-runtime/lib/vmcircbuf_sysv_shm.h b/gnuradio-runtime/lib/vmcircbuf_sysv_shm.h index 461d60544e..fa503ea312 100644 --- a/gnuradio-runtime/lib/vmcircbuf_sysv_shm.h +++ b/gnuradio-runtime/lib/vmcircbuf_sysv_shm.h @@ -23,8 +23,8 @@ #ifndef GR_VMCIRCBUF_SYSV_SHM_H #define GR_VMCIRCBUF_SYSV_SHM_H -#include <gnuradio/api.h> #include "vmcircbuf.h" +#include <gnuradio/api.h> namespace gr { |