diff options
| author | Lane Kolbly <lane.kolbly@ni.com> | 2020-04-07 15:19:32 -0500 |
|---|---|---|
| committer | Aaron Rossetto <aaron.rossetto@ni.com> | 2020-04-08 15:16:06 -0500 |
| commit | 5802a362f83bba3959a260ea9e00e4c65cf9508f (patch) | |
| tree | 71ac84911c4153650d6247ceb29da53278d44c65 /host | |
| parent | abf025f0a5c537f0b2ab07da933ffb82f62418ef (diff) | |
| download | uhd-5802a362f83bba3959a260ea9e00e4c65cf9508f.tar.gz uhd-5802a362f83bba3959a260ea9e00e4c65cf9508f.tar.bz2 uhd-5802a362f83bba3959a260ea9e00e4c65cf9508f.zip | |
uhd: Replace include guards with pragma once
Pragma once is the more modern version of include guards, eliminating
any potential problems with mistyping include guards. Let's use those.
Diffstat (limited to 'host')
270 files changed, 272 insertions, 1077 deletions
diff --git a/host/include/uhd.h b/host/include/uhd.h index 413e786f9..2b4d0c860 100644 --- a/host/include/uhd.h +++ b/host/include/uhd.h @@ -6,8 +6,7 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -#ifndef INCLUDED_UHD_H -#define INCLUDED_UHD_H +#pragma once #include <uhd/config.h> #include <uhd/error.h> @@ -30,5 +29,3 @@ #include <uhd/utils/thread_priority.h> #include <uhd/utils/log.h> - -#endif /* INCLUDED_UHD_H */ diff --git a/host/include/uhd/build_info.hpp b/host/include/uhd/build_info.hpp index 88de3ea27..f9c980b54 100644 --- a/host/include/uhd/build_info.hpp +++ b/host/include/uhd/build_info.hpp @@ -4,8 +4,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_UHD_BUILD_INFO_HPP -#define INCLUDED_UHD_BUILD_INFO_HPP +#pragma once #include <uhd/config.hpp> #include <string> @@ -39,5 +38,3 @@ UHD_API const std::string install_prefix(); //! Return the version of libusb this build was built with. UHD_API const std::string libusb_version(); }} // namespace uhd::build_info - -#endif /* INCLUDED_UHD_BUILD_INFO_HPP */ diff --git a/host/include/uhd/cal/container.hpp b/host/include/uhd/cal/container.hpp index 14f28d5ff..79a0a7b07 100644 --- a/host/include/uhd/cal/container.hpp +++ b/host/include/uhd/cal/container.hpp @@ -4,8 +4,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_LIBUHD_CAL_CONTAINER_HPP -#define INCLUDED_LIBUHD_CAL_CONTAINER_HPP +#pragma once #include <uhd/config.hpp> #include <stdint.h> @@ -55,5 +54,3 @@ public: }; }}} // namespace uhd::usrp::cal - -#endif /* INCLUDED_LIBUHD_CAL_CONTAINER_HPP */ diff --git a/host/include/uhd/cal/database.hpp b/host/include/uhd/cal/database.hpp index ca607de06..a4c233030 100644 --- a/host/include/uhd/cal/database.hpp +++ b/host/include/uhd/cal/database.hpp @@ -4,8 +4,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_LIBUHD_CAL_DATABASE_HPP -#define INCLUDED_LIBUHD_CAL_DATABASE_HPP +#pragma once #include <uhd/config.hpp> #include <stddef.h> @@ -135,5 +134,3 @@ public: }}} // namespace uhd::usrp::cal - -#endif /* INCLUDED_LIBUHD_CAL_DATABASE_HPP */ diff --git a/host/include/uhd/cal/iq_cal.hpp b/host/include/uhd/cal/iq_cal.hpp index 78f1c9177..4b2506c8c 100644 --- a/host/include/uhd/cal/iq_cal.hpp +++ b/host/include/uhd/cal/iq_cal.hpp @@ -4,8 +4,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_LIBUHD_CAL_IQ_DATA_HPP -#define INCLUDED_LIBUHD_CAL_IQ_DATA_HPP +#pragma once #include <uhd/cal/container.hpp> #include <uhd/config.hpp> @@ -74,5 +73,3 @@ public: }; }}} // namespace uhd::usrp::cal - -#endif /* INCLUDED_LIBUHD_CAL_IQ_DATA_HPP */ diff --git a/host/include/uhd/config.h b/host/include/uhd/config.h index 1aab06526..bacda212f 100644 --- a/host/include/uhd/config.h +++ b/host/include/uhd/config.h @@ -5,8 +5,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_UHD_CONFIG_H -#define INCLUDED_UHD_CONFIG_H +#pragma once #ifdef _MSC_VER // Bring in "and", "or", and "not" @@ -81,5 +80,3 @@ typedef ptrdiff_t ssize_t; #elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD_kernel__) #define UHD_PLATFORM_BSD #endif - -#endif /* INCLUDED_UHD_CONFIG_H */ diff --git a/host/include/uhd/config.hpp b/host/include/uhd/config.hpp index 812006ab5..cef957652 100644 --- a/host/include/uhd/config.hpp +++ b/host/include/uhd/config.hpp @@ -5,8 +5,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_UHD_CONFIG_HPP -#define INCLUDED_UHD_CONFIG_HPP +#pragma once #include <boost/config.hpp> #include <boost/version.hpp> @@ -137,5 +136,3 @@ typedef ptrdiff_t ssize_t; #endif #define STR(x) XSTR(x) - -#endif /* INCLUDED_UHD_CONFIG_HPP */ diff --git a/host/include/uhd/convert.hpp b/host/include/uhd/convert.hpp index 785e1a696..81632fb89 100644 --- a/host/include/uhd/convert.hpp +++ b/host/include/uhd/convert.hpp @@ -5,8 +5,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_UHD_CONVERT_HPP -#define INCLUDED_UHD_CONVERT_HPP +#pragma once #include <uhd/config.hpp> #include <uhd/types/ref_vector.hpp> @@ -101,5 +100,3 @@ UHD_API void register_bytes_per_item(const std::string& format, const size_t siz UHD_API size_t get_bytes_per_item(const std::string& format); }} // namespace uhd::convert - -#endif /* INCLUDED_UHD_CONVERT_HPP */ diff --git a/host/include/uhd/device.hpp b/host/include/uhd/device.hpp index a70a396a7..38424c866 100644 --- a/host/include/uhd/device.hpp +++ b/host/include/uhd/device.hpp @@ -5,8 +5,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_UHD_DEVICE_HPP -#define INCLUDED_UHD_DEVICE_HPP +#pragma once #include <uhd/config.hpp> #include <uhd/property_tree.hpp> @@ -116,5 +115,3 @@ protected: }; } // namespace uhd - -#endif /* INCLUDED_UHD_DEVICE_HPP */ diff --git a/host/include/uhd/error.h b/host/include/uhd/error.h index 199c29df4..de841bfbf 100644 --- a/host/include/uhd/error.h +++ b/host/include/uhd/error.h @@ -5,8 +5,7 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -#ifndef INCLUDED_UHD_ERROR_H -#define INCLUDED_UHD_ERROR_H +#pragma once #include <stdlib.h> @@ -156,5 +155,3 @@ UHD_API uhd_error uhd_get_last_error( #ifdef __cplusplus } #endif - -#endif /* INCLUDED_UHD_ERROR_H */ diff --git a/host/include/uhd/exception.hpp b/host/include/uhd/exception.hpp index adedebe96..bda2c18da 100644 --- a/host/include/uhd/exception.hpp +++ b/host/include/uhd/exception.hpp @@ -5,8 +5,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_UHD_EXCEPTION_HPP -#define INCLUDED_UHD_EXCEPTION_HPP +#pragma once #include <uhd/config.hpp> #include <boost/current_function.hpp> @@ -327,5 +326,3 @@ struct UHD_API routing_error : rfnoc_error } } // namespace uhd - -#endif /* INCLUDED_UHD_EXCEPTION_HPP */ diff --git a/host/include/uhd/image_loader.hpp b/host/include/uhd/image_loader.hpp index d3f9f5445..b941463cd 100644 --- a/host/include/uhd/image_loader.hpp +++ b/host/include/uhd/image_loader.hpp @@ -6,8 +6,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_UHD_IMAGE_LOADER_HPP -#define INCLUDED_UHD_IMAGE_LOADER_HPP +#pragma once #include <uhd/config.hpp> #include <uhd/types/device_addr.hpp> @@ -79,5 +78,3 @@ public: }; } // namespace uhd - -#endif /* INCLUDED_UHD_IMAGE_LOADER_HPP */ diff --git a/host/include/uhd/property_tree.hpp b/host/include/uhd/property_tree.hpp index e59d1a126..b6acb791f 100644 --- a/host/include/uhd/property_tree.hpp +++ b/host/include/uhd/property_tree.hpp @@ -6,8 +6,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_UHD_PROPERTY_TREE_HPP -#define INCLUDED_UHD_PROPERTY_TREE_HPP +#pragma once #include <uhd/config.hpp> #include <uhd/utils/noncopyable.hpp> @@ -268,5 +267,3 @@ private: } // namespace uhd #include <uhd/property_tree.ipp> - -#endif /* INCLUDED_UHD_PROPERTY_TREE_HPP */ diff --git a/host/include/uhd/property_tree.ipp b/host/include/uhd/property_tree.ipp index 7a4ffd85a..0fc871091 100644 --- a/host/include/uhd/property_tree.ipp +++ b/host/include/uhd/property_tree.ipp @@ -6,8 +6,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_UHD_PROPERTY_TREE_IPP -#define INCLUDED_UHD_PROPERTY_TREE_IPP +#pragma once #include <uhd/exception.hpp> #include <typeindex> @@ -201,5 +200,3 @@ typename std::shared_ptr<property<T> > property_tree::pop(const fs_path& path) } } // namespace uhd - -#endif /* INCLUDED_UHD_PROPERTY_TREE_IPP */ diff --git a/host/include/uhd/rfnoc/actions.hpp b/host/include/uhd/rfnoc/actions.hpp index 52e6b9287..28dbc9936 100644 --- a/host/include/uhd/rfnoc/actions.hpp +++ b/host/include/uhd/rfnoc/actions.hpp @@ -4,8 +4,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_LIBUHD_RFNOC_ACTIONS_HPP -#define INCLUDED_LIBUHD_RFNOC_ACTIONS_HPP +#pragma once #include <uhd/config.hpp> #include <uhd/types/device_addr.hpp> @@ -103,5 +102,3 @@ protected: }; }} /* namespace uhd::rfnoc */ - -#endif /* INCLUDED_LIBUHD_RFNOC_ACTIONS_HPP */ diff --git a/host/include/uhd/rfnoc/block_control.hpp b/host/include/uhd/rfnoc/block_control.hpp index 5995f6865..7b02c1e0f 100644 --- a/host/include/uhd/rfnoc/block_control.hpp +++ b/host/include/uhd/rfnoc/block_control.hpp @@ -4,8 +4,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_LIBUHD_BLOCK_CONTROL_HPP -#define INCLUDED_LIBUHD_BLOCK_CONTROL_HPP +#pragma once #include <uhd/config.hpp> #include <uhd/rfnoc/noc_block_base.hpp> @@ -21,5 +20,3 @@ public: }; }} // namespace uhd::rfnoc - -#endif /* INCLUDED_LIBUHD_BLOCK_CONTROL_HPP */ diff --git a/host/include/uhd/rfnoc/block_id.hpp b/host/include/uhd/rfnoc/block_id.hpp index 2af1e8948..c37190aa3 100644 --- a/host/include/uhd/rfnoc/block_id.hpp +++ b/host/include/uhd/rfnoc/block_id.hpp @@ -5,8 +5,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_UHD_TYPES_BLOCK_ID_HPP -#define INCLUDED_UHD_TYPES_BLOCK_ID_HPP +#pragma once #include <uhd/config.hpp> #include <stdint.h> @@ -234,5 +233,3 @@ inline std::ostream& operator<<(std::ostream& out, block_id_t block_id) } // namespace rfnoc } // namespace uhd - -#endif /* INCLUDED_UHD_TYPES_BLOCK_ID_HPP */ diff --git a/host/include/uhd/rfnoc/blockdef.hpp b/host/include/uhd/rfnoc/blockdef.hpp index 7a15dcfa4..b092c02df 100644 --- a/host/include/uhd/rfnoc/blockdef.hpp +++ b/host/include/uhd/rfnoc/blockdef.hpp @@ -5,8 +5,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_LIBUHD_RFNOC_BLOCKDEF_HPP -#define INCLUDED_LIBUHD_RFNOC_BLOCKDEF_HPP +#pragma once #include <uhd/config.hpp> #include <uhd/types/device_addr.hpp> @@ -112,5 +111,3 @@ public: }; }} /* namespace uhd::rfnoc */ - -#endif /* INCLUDED_LIBUHD_RFNOC_BLOCKDEF_HPP */ diff --git a/host/include/uhd/rfnoc/constants.hpp b/host/include/uhd/rfnoc/constants.hpp index 923091739..5029206a0 100644 --- a/host/include/uhd/rfnoc/constants.hpp +++ b/host/include/uhd/rfnoc/constants.hpp @@ -5,8 +5,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_LIBUHD_RFNOC_CONSTANTS_HPP -#define INCLUDED_LIBUHD_RFNOC_CONSTANTS_HPP +#pragma once #include <uhd/rfnoc/defaults.hpp> #include <uhd/types/dict.hpp> @@ -95,5 +94,3 @@ static const std::string VALID_BLOCKID_REGEX = "(?:(\\d+)(?:/))?([A-Za-z][A-Za-z0-9]*)(?:(?:#)(\\d\\d?))?"; }} /* namespace uhd::rfnoc */ - -#endif /* INCLUDED_LIBUHD_RFNOC_CONSTANTS_HPP */ diff --git a/host/include/uhd/rfnoc/ddc_block_control.hpp b/host/include/uhd/rfnoc/ddc_block_control.hpp index be0acc32c..88c7ce106 100644 --- a/host/include/uhd/rfnoc/ddc_block_control.hpp +++ b/host/include/uhd/rfnoc/ddc_block_control.hpp @@ -4,8 +4,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_LIBUHD_DDC_BLOCK_CONTROL_HPP -#define INCLUDED_LIBUHD_DDC_BLOCK_CONTROL_HPP +#pragma once #include <uhd/config.hpp> #include <uhd/rfnoc/noc_block_base.hpp> @@ -131,5 +130,3 @@ public: }; }} // namespace uhd::rfnoc - -#endif /* INCLUDED_LIBUHD_DDC_BLOCK_CONTROL_HPP */ diff --git a/host/include/uhd/rfnoc/defaults.hpp b/host/include/uhd/rfnoc/defaults.hpp index b786bfdef..bc97fd9f5 100644 --- a/host/include/uhd/rfnoc/defaults.hpp +++ b/host/include/uhd/rfnoc/defaults.hpp @@ -5,8 +5,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_LIBUHD_RFNOC_DEFAULTS_HPP -#define INCLUDED_LIBUHD_RFNOC_DEFAULTS_HPP +#pragma once #include <string> @@ -78,5 +77,3 @@ static const noc_id_t DDC_BLOCK = 0xDDC00000; static const noc_id_t FIR_FILTER_BLOCK = 0xf1120000; }} // namespace uhd::rfnoc - -#endif /* INCLUDED_LIBUHD_RFNOC_DEFAULTS_HPP */ diff --git a/host/include/uhd/rfnoc/dirtifier.hpp b/host/include/uhd/rfnoc/dirtifier.hpp index 7999df021..48c514f1a 100644 --- a/host/include/uhd/rfnoc/dirtifier.hpp +++ b/host/include/uhd/rfnoc/dirtifier.hpp @@ -4,8 +4,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_LIBUHD_DIRTIFYIER_HPP -#define INCLUDED_LIBUHD_DIRTIFYIER_HPP +#pragma once #include <uhd/rfnoc/property.hpp> @@ -69,5 +68,3 @@ private: }; }} /* namespace uhd::rfnoc */ - -#endif /* INCLUDED_LIBUHD_DIRTIFYIER_HPP */ diff --git a/host/include/uhd/rfnoc/dmafifo_block_control.hpp b/host/include/uhd/rfnoc/dmafifo_block_control.hpp index ea15efef2..126751a2d 100644 --- a/host/include/uhd/rfnoc/dmafifo_block_control.hpp +++ b/host/include/uhd/rfnoc/dmafifo_block_control.hpp @@ -4,8 +4,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_LIBUHD_DMAFIFO_BLOCK_CONTROL_HPP -#define INCLUDED_LIBUHD_DMAFIFO_BLOCK_CONTROL_HPP +#pragma once #include <uhd/config.hpp> #include <uhd/rfnoc/noc_block_base.hpp> @@ -21,5 +20,3 @@ public: }; }} // namespace uhd::rfnoc - -#endif /* INCLUDED_LIBUHD_DMAFIFO_BLOCK_CONTROL_HPP */ diff --git a/host/include/uhd/rfnoc/duc_block_control.hpp b/host/include/uhd/rfnoc/duc_block_control.hpp index 8b0325515..fcf15068e 100644 --- a/host/include/uhd/rfnoc/duc_block_control.hpp +++ b/host/include/uhd/rfnoc/duc_block_control.hpp @@ -4,8 +4,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_LIBUHD_DUC_BLOCK_CONTROL_HPP -#define INCLUDED_LIBUHD_DUC_BLOCK_CONTROL_HPP +#pragma once #include <uhd/config.hpp> #include <uhd/rfnoc/noc_block_base.hpp> @@ -119,5 +118,3 @@ public: }; }} // namespace uhd::rfnoc - -#endif /* INCLUDED_LIBUHD_DUC_BLOCK_CONTROL_HPP */ diff --git a/host/include/uhd/rfnoc/fft_block_control.hpp b/host/include/uhd/rfnoc/fft_block_control.hpp index e3e8c6b85..d4278b840 100644 --- a/host/include/uhd/rfnoc/fft_block_control.hpp +++ b/host/include/uhd/rfnoc/fft_block_control.hpp @@ -4,8 +4,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_LIBUHD_FFT_BLOCK_CONTROL_HPP -#define INCLUDED_LIBUHD_FFT_BLOCK_CONTROL_HPP +#pragma once #include <uhd/config.hpp> #include <uhd/rfnoc/noc_block_base.hpp> @@ -47,5 +46,3 @@ public: }; }} // namespace uhd::rfnoc - -#endif /* INCLUDED_LIBUHD_FFT_BLOCK_CONTROL_HPP */ diff --git a/host/include/uhd/rfnoc/filter_node.hpp b/host/include/uhd/rfnoc/filter_node.hpp index 73875e463..e711b7c5a 100644 --- a/host/include/uhd/rfnoc/filter_node.hpp +++ b/host/include/uhd/rfnoc/filter_node.hpp @@ -4,8 +4,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_LIBUHD_FILTER_NODE_HPP -#define INCLUDED_LIBUHD_FILTER_NODE_HPP +#pragma once #include <uhd/types/filters.hpp> #include <string> @@ -38,5 +37,3 @@ public: }; }}} /* namespace uhd::rfnoc::detail */ - -#endif /* INCLUDED_LIBUHD_FILTER_NODE_HPP */ diff --git a/host/include/uhd/rfnoc/graph_edge.hpp b/host/include/uhd/rfnoc/graph_edge.hpp index 8ab33f2a7..aee792cfa 100644 --- a/host/include/uhd/rfnoc/graph_edge.hpp +++ b/host/include/uhd/rfnoc/graph_edge.hpp @@ -4,8 +4,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_LIBUHD_RFNOC_GRAPH_EDGE_HPP -#define INCLUDED_LIBUHD_RFNOC_GRAPH_EDGE_HPP +#pragma once #include <uhd/config.hpp> #include <string> @@ -82,5 +81,3 @@ struct UHD_API graph_edge_t }} /* namespace uhd::rfnoc */ - -#endif /* INCLUDED_LIBUHD_RFNOC_GRAPH_EDGE_HPP */ diff --git a/host/include/uhd/rfnoc/mb_controller.hpp b/host/include/uhd/rfnoc/mb_controller.hpp index cf214c285..e1268d923 100644 --- a/host/include/uhd/rfnoc/mb_controller.hpp +++ b/host/include/uhd/rfnoc/mb_controller.hpp @@ -4,8 +4,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_LIBUHD_MB_CONTROLLER_HPP -#define INCLUDED_LIBUHD_MB_CONTROLLER_HPP +#pragma once #include <uhd/config.hpp> #include <uhd/types/device_addr.hpp> @@ -400,5 +399,3 @@ private: }; }} // namespace uhd::rfnoc - -#endif /* INCLUDED_LIBUHD_MB_CONTROLLER_HPP */ diff --git a/host/include/uhd/rfnoc/mock_block.hpp b/host/include/uhd/rfnoc/mock_block.hpp index a388a9359..fef8815b7 100644 --- a/host/include/uhd/rfnoc/mock_block.hpp +++ b/host/include/uhd/rfnoc/mock_block.hpp @@ -4,8 +4,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_LIBUHD_MOCK_BLOCK_HPP -#define INCLUDED_LIBUHD_MOCK_BLOCK_HPP +#pragma once #include <uhd/config.hpp> #include <uhd/property_tree.hpp> @@ -188,5 +187,3 @@ UHD_API mock_block_container get_mock_block(const noc_id_t noc_id, std::shared_ptr<mock_reg_iface_t> client_reg_iface = nullptr); }}; // namespace uhd::rfnoc - -#endif /* INCLUDED_LIBUHD_MOCK_BLOCK_HPP */ diff --git a/host/include/uhd/rfnoc/multichan_register_iface.hpp b/host/include/uhd/rfnoc/multichan_register_iface.hpp index 9517dde6e..476b8aad7 100644 --- a/host/include/uhd/rfnoc/multichan_register_iface.hpp +++ b/host/include/uhd/rfnoc/multichan_register_iface.hpp @@ -4,8 +4,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_LIBUHD_RFNOC_MULTICHAN_REGISTER_IFACE_HPP -#define INCLUDED_LIBUHD_RFNOC_MULTICHAN_REGISTER_IFACE_HPP +#pragma once #include <uhd/rfnoc/register_iface.hpp> #include <uhd/rfnoc/register_iface_holder.hpp> @@ -290,5 +289,3 @@ private: }; // class multichan_register_iface }} /* namespace uhd::rfnoc */ - -#endif /* INCLUDED_LIBUHD_RFNOC_MULTICHAN_REGISTER_IFACE_HPP */ diff --git a/host/include/uhd/rfnoc/noc_block_base.hpp b/host/include/uhd/rfnoc/noc_block_base.hpp index 19d4e63a3..633046c41 100644 --- a/host/include/uhd/rfnoc/noc_block_base.hpp +++ b/host/include/uhd/rfnoc/noc_block_base.hpp @@ -4,8 +4,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_LIBUHD_NOC_BLOCK_BASE_HPP -#define INCLUDED_LIBUHD_NOC_BLOCK_BASE_HPP +#pragma once #include <uhd/config.hpp> #include <uhd/property_tree.hpp> @@ -320,5 +319,3 @@ private: }} /* namespace uhd::rfnoc */ #include <uhd/rfnoc/noc_block_make_args.hpp> - -#endif /* INCLUDED_LIBUHD_NOC_BLOCK_BASE_HPP */ diff --git a/host/include/uhd/rfnoc/noc_block_make_args.hpp b/host/include/uhd/rfnoc/noc_block_make_args.hpp index 52feb71c0..9d45c98b0 100644 --- a/host/include/uhd/rfnoc/noc_block_make_args.hpp +++ b/host/include/uhd/rfnoc/noc_block_make_args.hpp @@ -4,8 +4,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_LIBUHD_NOC_BLOCK_MAKE_ARGS_HPP -#define INCLUDED_LIBUHD_NOC_BLOCK_MAKE_ARGS_HPP +#pragma once #include <uhd/property_tree.hpp> #include <uhd/rfnoc/noc_block_base.hpp> @@ -63,5 +62,3 @@ struct noc_block_base::make_args_t }; }} /* namespace uhd::rfnoc */ - -#endif /* INCLUDED_LIBUHD_NOC_BLOCK_MAKE_ARGS_HPP */ diff --git a/host/include/uhd/rfnoc/node.hpp b/host/include/uhd/rfnoc/node.hpp index c680deef8..a907de5a4 100644 --- a/host/include/uhd/rfnoc/node.hpp +++ b/host/include/uhd/rfnoc/node.hpp @@ -4,8 +4,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_LIBUHD_RFNOC_NODE_HPP -#define INCLUDED_LIBUHD_RFNOC_NODE_HPP +#pragma once #include <uhd/rfnoc/actions.hpp> #include <uhd/rfnoc/dirtifier.hpp> @@ -632,5 +631,3 @@ private: }} /* namespace uhd::rfnoc */ #include <uhd/rfnoc/node.ipp> - -#endif /* INCLUDED_LIBUHD_RFNOC_NODE_HPP */ diff --git a/host/include/uhd/rfnoc/node.ipp b/host/include/uhd/rfnoc/node.ipp index 339b055fd..117cf2313 100644 --- a/host/include/uhd/rfnoc/node.ipp +++ b/host/include/uhd/rfnoc/node.ipp @@ -4,8 +4,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_LIBUHD_RFNOC_NODE_IPP -#define INCLUDED_LIBUHD_RFNOC_NODE_IPP +#pragma once #include <boost/format.hpp> #include <boost/units/detail/utility.hpp> @@ -91,5 +90,3 @@ const prop_data_t& node_t::get_property( }} /* namespace uhd::rfnoc */ -#endif /* INCLUDED_LIBUHD_RFNOC_NODE_IPP */ - diff --git a/host/include/uhd/rfnoc/null_block_control.hpp b/host/include/uhd/rfnoc/null_block_control.hpp index 4844946d5..1e426b312 100644 --- a/host/include/uhd/rfnoc/null_block_control.hpp +++ b/host/include/uhd/rfnoc/null_block_control.hpp @@ -4,8 +4,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_LIBUHD_NULL_BLOCK_CONTROL_HPP -#define INCLUDED_LIBUHD_NULL_BLOCK_CONTROL_HPP +#pragma once #include <uhd/config.hpp> #include <uhd/rfnoc/noc_block_base.hpp> @@ -83,5 +82,3 @@ public: }; }} // namespace uhd::rfnoc - -#endif /* INCLUDED_LIBUHD_NULL_BLOCK_CONTROL_HPP */ diff --git a/host/include/uhd/rfnoc/property.hpp b/host/include/uhd/rfnoc/property.hpp index efe4deb1d..a1e877440 100644 --- a/host/include/uhd/rfnoc/property.hpp +++ b/host/include/uhd/rfnoc/property.hpp @@ -4,8 +4,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_LIBUHD_PROPERTY_HPP -#define INCLUDED_LIBUHD_PROPERTY_HPP +#pragma once #include <uhd/exception.hpp> #include <uhd/rfnoc/res_source_info.hpp> @@ -305,5 +304,3 @@ private: }} /* namespace uhd::rfnoc */ #include <uhd/rfnoc/property.ipp> - -#endif /* INCLUDED_LIBUHD_PROPERTY_HPP */ diff --git a/host/include/uhd/rfnoc/property.ipp b/host/include/uhd/rfnoc/property.ipp index 87b4394e6..2e6c18ca2 100644 --- a/host/include/uhd/rfnoc/property.ipp +++ b/host/include/uhd/rfnoc/property.ipp @@ -4,8 +4,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_LIBUHD_PROPERTY_IPP -#define INCLUDED_LIBUHD_PROPERTY_IPP +#pragma once template <typename data_t> uhd::rfnoc::property_t<data_t>::property_t( @@ -33,5 +32,3 @@ uhd::rfnoc::property_t<data_t>::property_t( { // nop } - -#endif /* INCLUDED_LIBUHD_PROPERTY_IPP */ diff --git a/host/include/uhd/rfnoc/radio_control.hpp b/host/include/uhd/rfnoc/radio_control.hpp index 2ae80ff9b..9d343cdac 100644 --- a/host/include/uhd/rfnoc/radio_control.hpp +++ b/host/include/uhd/rfnoc/radio_control.hpp @@ -4,8 +4,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_LIBUHD_RADIO_BLOCK_CONTROL_HPP -#define INCLUDED_LIBUHD_RADIO_BLOCK_CONTROL_HPP +#pragma once #include <uhd/config.hpp> #include <uhd/rfnoc/noc_block_base.hpp> @@ -687,5 +686,3 @@ public: }; }} // namespace uhd::rfnoc - -#endif /* INCLUDED_LIBUHD_RADIO_BLOCK_CONTROL_HPP */ diff --git a/host/include/uhd/rfnoc/register_iface.hpp b/host/include/uhd/rfnoc/register_iface.hpp index e0849f1c3..baac40e00 100644 --- a/host/include/uhd/rfnoc/register_iface.hpp +++ b/host/include/uhd/rfnoc/register_iface.hpp @@ -4,8 +4,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_LIBUHD_RFNOC_REGISTER_IFACE_HPP -#define INCLUDED_LIBUHD_RFNOC_REGISTER_IFACE_HPP +#pragma once #include <uhd/types/device_addr.hpp> #include <uhd/types/time_spec.hpp> @@ -317,5 +316,3 @@ public: }; // class register_iface }} /* namespace uhd::rfnoc */ - -#endif /* INCLUDED_LIBUHD_RFNOC_REGISTER_IFACE_HPP */ diff --git a/host/include/uhd/rfnoc/register_iface_holder.hpp b/host/include/uhd/rfnoc/register_iface_holder.hpp index e6eafc736..a16c3502c 100644 --- a/host/include/uhd/rfnoc/register_iface_holder.hpp +++ b/host/include/uhd/rfnoc/register_iface_holder.hpp @@ -4,8 +4,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_LIBUHD_REGISTER_IFACE_HOLDER_HPP -#define INCLUDED_LIBUHD_REGISTER_IFACE_HOLDER_HPP +#pragma once #include <uhd/rfnoc/register_iface.hpp> @@ -39,5 +38,3 @@ private: }; }} /* namespace uhd::rfnoc */ - -#endif /* INCLUDED_LIBUHD_REGISTER_IFACE_HOLDER_HPP */ diff --git a/host/include/uhd/rfnoc/registry.hpp b/host/include/uhd/rfnoc/registry.hpp index 931b4a1dd..362899ccc 100644 --- a/host/include/uhd/rfnoc/registry.hpp +++ b/host/include/uhd/rfnoc/registry.hpp @@ -4,8 +4,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_LIBUHD_RFNOC_REGISTRY_HPP -#define INCLUDED_LIBUHD_RFNOC_REGISTRY_HPP +#pragma once #include <uhd/config.hpp> #include <uhd/rfnoc/defaults.hpp> @@ -109,5 +108,3 @@ public: }; }} /* namespace uhd::rfnoc */ - -#endif /* INCLUDED_LIBUHD_RFNOC_REGISTRY_HPP */ diff --git a/host/include/uhd/rfnoc/res_source_info.hpp b/host/include/uhd/rfnoc/res_source_info.hpp index 9ac978f18..7174c95e4 100644 --- a/host/include/uhd/rfnoc/res_source_info.hpp +++ b/host/include/uhd/rfnoc/res_source_info.hpp @@ -4,8 +4,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_LIBUHD_RES_SRC_INFO_HPP -#define INCLUDED_LIBUHD_RES_SRC_INFO_HPP +#pragma once #include <uhd/exception.hpp> #include <cstdint> @@ -87,5 +86,3 @@ struct hash<uhd::rfnoc::res_source_info> } }; } // namespace std - -#endif /* INCLUDED_LIBUHD_RES_SRC_INFO_HPP */ diff --git a/host/include/uhd/rfnoc/traffic_counter.hpp b/host/include/uhd/rfnoc/traffic_counter.hpp index b30eff329..ef73e9678 100644 --- a/host/include/uhd/rfnoc/traffic_counter.hpp +++ b/host/include/uhd/rfnoc/traffic_counter.hpp @@ -5,8 +5,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_LIBUHD_TRAFFIC_COUNTER_HPP -#define INCLUDED_LIBUHD_TRAFFIC_COUNTER_HPP +#pragma once #include <uhd/property_tree.hpp> #include <uhdlib/utils/narrow.hpp> @@ -72,5 +71,3 @@ private: }; }} /* namespace uhd::rfnoc */ - -#endif /* INCLUDED_LIBUHD_TRAFFIC_COUNTER_HPP */ diff --git a/host/include/uhd/rfnoc_graph.hpp b/host/include/uhd/rfnoc_graph.hpp index c62eaf558..b414cc852 100644 --- a/host/include/uhd/rfnoc_graph.hpp +++ b/host/include/uhd/rfnoc_graph.hpp @@ -4,8 +4,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_LIBUHD_RFNOCDEV_GRAPH_HPP -#define INCLUDED_LIBUHD_RFNOCDEV_GRAPH_HPP +#pragma once #include <uhd/config.hpp> #include <uhd/rfnoc/block_id.hpp> @@ -342,5 +341,3 @@ public: }; // class rfnoc_graph }}; // namespace uhd::rfnoc - -#endif /* INCLUDED_LIBUHD_RFNOCDEV_GRAPH_HPP */ diff --git a/host/include/uhd/stream.hpp b/host/include/uhd/stream.hpp index 22eb8f4dd..b80373c68 100644 --- a/host/include/uhd/stream.hpp +++ b/host/include/uhd/stream.hpp @@ -5,8 +5,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_UHD_STREAM_HPP -#define INCLUDED_UHD_STREAM_HPP +#pragma once #include <uhd/config.hpp> #include <uhd/types/device_addr.hpp> @@ -305,5 +304,3 @@ public: }; } // namespace uhd - -#endif /* INCLUDED_UHD_STREAM_HPP */ diff --git a/host/include/uhd/transport/adapter_id.hpp b/host/include/uhd/transport/adapter_id.hpp index 02041bc4c..8f8c40aa1 100644 --- a/host/include/uhd/transport/adapter_id.hpp +++ b/host/include/uhd/transport/adapter_id.hpp @@ -4,8 +4,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_UHD_TRANSPORT_ADAPTER_ID_HPP -#define INCLUDED_UHD_TRANSPORT_ADAPTER_ID_HPP +#pragma once #include <cstddef> @@ -17,5 +16,3 @@ using adapter_id_t = size_t; static const adapter_id_t NULL_ADAPTER_ID = 0; }} // namespace uhd::transport - -#endif /* INCLUDED_UHD_TRANSPORT_ADAPTER_ID_HPP */ diff --git a/host/include/uhd/transport/bounded_buffer.hpp b/host/include/uhd/transport/bounded_buffer.hpp index 9368cdfba..b1886476b 100644 --- a/host/include/uhd/transport/bounded_buffer.hpp +++ b/host/include/uhd/transport/bounded_buffer.hpp @@ -5,8 +5,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_UHD_TRANSPORT_BOUNDED_BUFFER_HPP -#define INCLUDED_UHD_TRANSPORT_BOUNDED_BUFFER_HPP +#pragma once #include <uhd/transport/bounded_buffer.ipp> //detail @@ -115,5 +114,3 @@ private: }; }} // namespace uhd::transport - -#endif /* INCLUDED_UHD_TRANSPORT_BOUNDED_BUFFER_HPP */ diff --git a/host/include/uhd/transport/bounded_buffer.ipp b/host/include/uhd/transport/bounded_buffer.ipp index 16ce5f312..3e15fc03a 100644 --- a/host/include/uhd/transport/bounded_buffer.ipp +++ b/host/include/uhd/transport/bounded_buffer.ipp @@ -5,8 +5,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_UHD_TRANSPORT_BOUNDED_BUFFER_IPP -#define INCLUDED_UHD_TRANSPORT_BOUNDED_BUFFER_IPP +#pragma once #include <uhd/config.hpp> #include <uhd/utils/noncopyable.hpp> @@ -154,5 +153,3 @@ namespace uhd{ namespace transport{ }; }} //namespace - -#endif /* INCLUDED_UHD_TRANSPORT_BOUNDED_BUFFER_IPP */ diff --git a/host/include/uhd/transport/buffer_pool.hpp b/host/include/uhd/transport/buffer_pool.hpp index 125d5b8e3..36d1a0c91 100644 --- a/host/include/uhd/transport/buffer_pool.hpp +++ b/host/include/uhd/transport/buffer_pool.hpp @@ -5,8 +5,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_UHD_TRANSPORT_BUFFER_POOL_HPP -#define INCLUDED_UHD_TRANSPORT_BUFFER_POOL_HPP +#pragma once #include <uhd/config.hpp> #include <uhd/utils/noncopyable.hpp> @@ -45,5 +44,3 @@ public: }} // namespace uhd::transport - -#endif /* INCLUDED_UHD_TRANSPORT_BUFFER_POOL_HPP */ diff --git a/host/include/uhd/transport/chdr.hpp b/host/include/uhd/transport/chdr.hpp index f4b5c91f1..d13b4591f 100644 --- a/host/include/uhd/transport/chdr.hpp +++ b/host/include/uhd/transport/chdr.hpp @@ -5,8 +5,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_UHD_TRANSPORT_CHDR_HPP -#define INCLUDED_UHD_TRANSPORT_CHDR_HPP +#pragma once #include <uhd/transport/vrt_if_packet.hpp> @@ -88,5 +87,3 @@ UHD_API void if_hdr_unpack_le( } // namespace chdr }}} // namespace uhd::transport::vrt - -#endif /* INCLUDED_UHD_TRANSPORT_CHDR_HPP */ diff --git a/host/include/uhd/transport/frame_buff.hpp b/host/include/uhd/transport/frame_buff.hpp index c335f0c4b..1f1208e3a 100644 --- a/host/include/uhd/transport/frame_buff.hpp +++ b/host/include/uhd/transport/frame_buff.hpp @@ -4,8 +4,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_UHD_TRANSPORT_FRAME_BUFF_HPP -#define INCLUDED_UHD_TRANSPORT_FRAME_BUFF_HPP +#pragma once #include <memory> @@ -65,5 +64,3 @@ protected: }; }} // namespace uhd::transport - -#endif /* INCLUDED_UHD_TRANSPORT_FRAME_BUFF_HPP */ diff --git a/host/include/uhd/transport/if_addrs.hpp b/host/include/uhd/transport/if_addrs.hpp index b97c6156e..5a6ddf641 100644 --- a/host/include/uhd/transport/if_addrs.hpp +++ b/host/include/uhd/transport/if_addrs.hpp @@ -5,8 +5,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_UHD_TRANSPORT_IF_ADDRS_HPP -#define INCLUDED_UHD_TRANSPORT_IF_ADDRS_HPP +#pragma once #include <uhd/config.hpp> #include <string> @@ -33,5 +32,3 @@ UHD_API std::vector<if_addrs_t> get_if_addrs(void); }} // namespace uhd::transport - -#endif /* INCLUDED_UHD_TRANSPORT_IF_ADDRS_HPP */ diff --git a/host/include/uhd/transport/muxed_zero_copy_if.hpp b/host/include/uhd/transport/muxed_zero_copy_if.hpp index d8d77fccc..1408ced9a 100644 --- a/host/include/uhd/transport/muxed_zero_copy_if.hpp +++ b/host/include/uhd/transport/muxed_zero_copy_if.hpp @@ -5,8 +5,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_LIBUHD_TRANSPORT_MUXED_ZERO_COPY_IF_HPP -#define INCLUDED_LIBUHD_TRANSPORT_MUXED_ZERO_COPY_IF_HPP +#pragma once #include <uhd/config.hpp> #include <uhd/transport/zero_copy.hpp> @@ -61,5 +60,3 @@ public: }; }} // namespace uhd::transport - -#endif /* INCLUDED_LIBUHD_TRANSPORT_MUXED_ZERO_COPY_IF_HPP */ diff --git a/host/include/uhd/transport/nirio/nifpga_lvbitx.h b/host/include/uhd/transport/nirio/nifpga_lvbitx.h index a66e8fcc3..201e53c3f 100644 --- a/host/include/uhd/transport/nirio/nifpga_lvbitx.h +++ b/host/include/uhd/transport/nirio/nifpga_lvbitx.h @@ -5,8 +5,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_UHD_TRANSPORT_NIRIO_NIFPGA_LVBITX_H -#define INCLUDED_UHD_TRANSPORT_NIRIO_NIFPGA_LVBITX_H +#pragma once #include <uhd/transport/nirio/nirio_resource_manager.h> #include <uhd/transport/nirio/niriok_proxy.h> @@ -44,5 +43,3 @@ protected: }} -#endif /* INCLUDED_UHD_TRANSPORT_NIRIO_NIFPGA_LVBITX_H */ - diff --git a/host/include/uhd/transport/nirio/nirio_driver_iface.h b/host/include/uhd/transport/nirio/nirio_driver_iface.h index 491d8e809..043b8a944 100644 --- a/host/include/uhd/transport/nirio/nirio_driver_iface.h +++ b/host/include/uhd/transport/nirio/nirio_driver_iface.h @@ -5,8 +5,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_UHD_TRANSPORT_NIRIO_NIRIO_DRIVER_IFACE_H -#define INCLUDED_UHD_TRANSPORT_NIRIO_NIRIO_DRIVER_IFACE_H +#pragma once #include <stddef.h> #include <stdint.h> @@ -182,5 +181,3 @@ static const rio_dev_handle_t INVALID_RIO_HANDLE = ((rio_dev_handle_t)-1); nirio_status rio_munmap( rio_mmap_t &map); } - -#endif diff --git a/host/include/uhd/transport/nirio/nirio_fifo.h b/host/include/uhd/transport/nirio/nirio_fifo.h index 405e6c41d..0cd9f1906 100644 --- a/host/include/uhd/transport/nirio/nirio_fifo.h +++ b/host/include/uhd/transport/nirio/nirio_fifo.h @@ -7,8 +7,7 @@ // -#ifndef INCLUDED_UHD_TRANSPORT_NIRIO_NIRIO_FIFO_H -#define INCLUDED_UHD_TRANSPORT_NIRIO_NIRIO_FIFO_H +#pragma once #include <uhd/transport/nirio/nirio_driver_iface.h> #include <uhd/transport/nirio/niriok_proxy.h> @@ -232,5 +231,3 @@ private: //Members #include <uhd/transport/nirio/nirio_fifo.ipp> }} - -#endif /* INCLUDED_UHD_TRANSPORT_NIRIO_NIRIO_FIFO_H */ diff --git a/host/include/uhd/transport/nirio/nirio_quirks.h b/host/include/uhd/transport/nirio/nirio_quirks.h index f355f80b7..021ee0912 100644 --- a/host/include/uhd/transport/nirio/nirio_quirks.h +++ b/host/include/uhd/transport/nirio/nirio_quirks.h @@ -6,8 +6,7 @@ // -#ifndef INCLUDED_UHD_TRANSPORT_NIRIO_NIRIO_QUIRKS_H -#define INCLUDED_UHD_TRANSPORT_NIRIO_NIRIO_QUIRKS_H +#pragma once #include <set> #include <stdint.h> @@ -65,5 +64,3 @@ private: }; }} - -#endif /* INCLUDED_UHD_TRANSPORT_NIRIO_NIRIO_QUIRKS_H */ diff --git a/host/include/uhd/transport/nirio/nirio_resource_manager.h b/host/include/uhd/transport/nirio/nirio_resource_manager.h index e1562419f..a43529cf7 100644 --- a/host/include/uhd/transport/nirio/nirio_resource_manager.h +++ b/host/include/uhd/transport/nirio/nirio_resource_manager.h @@ -6,8 +6,7 @@ // -#ifndef INCLUDED_UHD_TRANSPORT_NIRIO_NIRIO_RESOURCE_MANAGER_H -#define INCLUDED_UHD_TRANSPORT_NIRIO_NIRIO_RESOURCE_MANAGER_H +#pragma once #include <uhd/transport/nirio/nirio_fifo.h> #include <uhd/transport/nirio/niriok_proxy.h> @@ -106,4 +105,3 @@ private: }; }} -#endif /* INCLUDED_UHD_TRANSPORT_NIRIO_NIRIO_RESOURCE_MANAGER_H */ diff --git a/host/include/uhd/transport/nirio/niriok_proxy.h b/host/include/uhd/transport/nirio/niriok_proxy.h index 13cf172fa..24275e0b0 100644 --- a/host/include/uhd/transport/nirio/niriok_proxy.h +++ b/host/include/uhd/transport/nirio/niriok_proxy.h @@ -5,8 +5,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_UHD_TRANSPORT_NIRIO_NIRIO_INTERFACE_H -#define INCLUDED_UHD_TRANSPORT_NIRIO_NIRIO_INTERFACE_H +#pragma once #include <uhd/transport/nirio/nirio_driver_iface.h> #include <uhd/transport/nirio/nirio_quirks.h> @@ -271,5 +270,3 @@ namespace uhd { namespace niusrprio nirio_status cache_status; }; }} - -#endif /* INCLUDED_UHD_TRANSPORT_NIRIO_NIRIO_INTERFACE_H */ diff --git a/host/include/uhd/transport/nirio/niriok_proxy_impl_v1.h b/host/include/uhd/transport/nirio/niriok_proxy_impl_v1.h index b659cffab..437e4e98f 100644 --- a/host/include/uhd/transport/nirio/niriok_proxy_impl_v1.h +++ b/host/include/uhd/transport/nirio/niriok_proxy_impl_v1.h @@ -5,8 +5,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_UHD_TRANSPORT_NIRIO_NIRIO_PROXY_IMPL_V1_H -#define INCLUDED_UHD_TRANSPORT_NIRIO_NIRIO_PROXY_IMPL_V1_H +#pragma once #include <uhd/utils/noncopyable.hpp> #include <uhd/transport/nirio/nirio_driver_iface.h> @@ -133,5 +132,3 @@ namespace uhd { namespace niusrprio }; }} - -#endif /* INCLUDED_UHD_TRANSPORT_NIRIO_NIRIO_PROXY_IMPL_V1_H */ diff --git a/host/include/uhd/transport/nirio/niriok_proxy_impl_v2.h b/host/include/uhd/transport/nirio/niriok_proxy_impl_v2.h index 0f49749de..de7b23e9e 100644 --- a/host/include/uhd/transport/nirio/niriok_proxy_impl_v2.h +++ b/host/include/uhd/transport/nirio/niriok_proxy_impl_v2.h @@ -5,8 +5,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_UHD_TRANSPORT_NIRIO_NIRIO_PROXY_IMPL_V2_H -#define INCLUDED_UHD_TRANSPORT_NIRIO_NIRIO_PROXY_IMPL_V2_H +#pragma once #include <uhd/utils/noncopyable.hpp> #include <uhd/transport/nirio/nirio_driver_iface.h> @@ -126,5 +125,3 @@ namespace uhd { namespace niusrprio }; }} - -#endif /* INCLUDED_UHD_TRANSPORT_NIRIO_NIRIO_PROXY_IMPL_V2_H */ diff --git a/host/include/uhd/transport/nirio/niusrprio_session.h b/host/include/uhd/transport/nirio/niusrprio_session.h index 2fff0ac36..183f766cc 100644 --- a/host/include/uhd/transport/nirio/niusrprio_session.h +++ b/host/include/uhd/transport/nirio/niusrprio_session.h @@ -6,8 +6,7 @@ // -#ifndef INCLUDED_UHD_TRANSPORT_NIRIO_NIUSRPRIO_SESSION_H -#define INCLUDED_UHD_TRANSPORT_NIRIO_NIUSRPRIO_SESSION_H +#pragma once #include <uhd/transport/nirio/nifpga_lvbitx.h> #include <uhd/transport/nirio/nirio_resource_manager.h> @@ -108,5 +107,3 @@ private: }; }} // namespace uhd::niusrprio - -#endif /* INCLUDED_UHD_TRANSPORT_NIRIO_NIUSRPRIO_SESSION_H */ diff --git a/host/include/uhd/transport/nirio/rpc/rpc_client.hpp b/host/include/uhd/transport/nirio/rpc/rpc_client.hpp index 04f560e6a..9361b7276 100644 --- a/host/include/uhd/transport/nirio/rpc/rpc_client.hpp +++ b/host/include/uhd/transport/nirio/rpc/rpc_client.hpp @@ -5,8 +5,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_RPC_CLIENT_HPP -#define INCLUDED_RPC_CLIENT_HPP +#pragma once #include "rpc_common.hpp" #include <uhd/utils/log.hpp> @@ -83,5 +82,3 @@ private: }; }} // namespace uhd::usrprio_rpc - -#endif /* INCLUDED_RPC_CLIENT_HPP */ diff --git a/host/include/uhd/transport/nirio/rpc/rpc_common.hpp b/host/include/uhd/transport/nirio/rpc/rpc_common.hpp index debb5c959..c4cbb9339 100644 --- a/host/include/uhd/transport/nirio/rpc/rpc_common.hpp +++ b/host/include/uhd/transport/nirio/rpc/rpc_common.hpp @@ -5,8 +5,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_RPC_COMMON_HPP -#define INCLUDED_RPC_COMMON_HPP +#pragma once #define USE_BINARY_ARCHIVE 0 @@ -161,5 +160,3 @@ public: }} // namespace uhd::usrprio_rpc #undef USE_BINARY_ARCHIVE - -#endif /* INCLUDED_RPC_COMMON_HPP */ diff --git a/host/include/uhd/transport/nirio/rpc/usrprio_rpc_client.hpp b/host/include/uhd/transport/nirio/rpc/usrprio_rpc_client.hpp index 1d67d9286..686ce19a3 100644 --- a/host/include/uhd/transport/nirio/rpc/usrprio_rpc_client.hpp +++ b/host/include/uhd/transport/nirio/rpc/usrprio_rpc_client.hpp @@ -5,8 +5,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_USRPRIO_RPC_CLIENT_HPP -#define INCLUDED_USRPRIO_RPC_CLIENT_HPP +#pragma once #include <uhd/transport/nirio/rpc/rpc_client.hpp> #include <uhd/transport/nirio/rpc/rpc_common.hpp> @@ -50,5 +49,3 @@ private: }; }} // namespace uhd::usrprio_rpc - -#endif /* INCLUDED_USRPRIO_RPC_CLIENT_HPP */ diff --git a/host/include/uhd/transport/nirio/rpc/usrprio_rpc_common.hpp b/host/include/uhd/transport/nirio/rpc/usrprio_rpc_common.hpp index bbb44f2d6..48d91ba27 100644 --- a/host/include/uhd/transport/nirio/rpc/usrprio_rpc_common.hpp +++ b/host/include/uhd/transport/nirio/rpc/usrprio_rpc_common.hpp @@ -5,8 +5,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_USRPRIO_RPC_COMMON_HPP -#define INCLUDED_USRPRIO_RPC_COMMON_HPP +#pragma once #include <uhd/transport/nirio/rpc/rpc_common.hpp> @@ -64,5 +63,3 @@ typedef std::vector<usrprio_device_info> usrprio_device_info_vtr; #define NIUSRPRIO_DOWNLOAD_FPGA_TO_FLASH_ARGS \ const std::string &resource, const std::string &bitstream_path }} // namespace uhd::usrprio_rpc - -#endif /* INCLUDED_USRPRIO_RPC_COMMON_HPP */ diff --git a/host/include/uhd/transport/nirio/status.h b/host/include/uhd/transport/nirio/status.h index 55f52eca6..8036e2e75 100644 --- a/host/include/uhd/transport/nirio/status.h +++ b/host/include/uhd/transport/nirio/status.h @@ -6,8 +6,7 @@ // -#ifndef INCLUDED_UHD_TRANSPORT_NIRIO_STATUS_H -#define INCLUDED_UHD_TRANSPORT_NIRIO_STATUS_H +#pragma once #include <stdio.h> #include <stddef.h> @@ -52,5 +51,3 @@ UHD_API void nirio_status_to_exception(const nirio_status& status, const std::st static const nirio_status CONST_NAME = ERR_CODE; #include "nirio_err_template.h" #undef NIRIO_ERR_INFO - -#endif /* INCLUDED_UHD_TRANSPORT_NIRIO_STATUS_H */ diff --git a/host/include/uhd/transport/nirio_zero_copy.hpp b/host/include/uhd/transport/nirio_zero_copy.hpp index 096f592a8..66b9bff56 100644 --- a/host/include/uhd/transport/nirio_zero_copy.hpp +++ b/host/include/uhd/transport/nirio_zero_copy.hpp @@ -5,8 +5,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_UHD_TRANSPORT_NIRIO_ZERO_COPY_HPP -#define INCLUDED_UHD_TRANSPORT_NIRIO_ZERO_COPY_HPP +#pragma once #include <uhd/config.hpp> #include <uhd/transport/nirio/niusrprio_session.h> @@ -29,5 +28,3 @@ public: }; }} // namespace uhd::transport - -#endif /* INCLUDED_UHD_TRANSPORT_NIRIO_ZERO_COPY_HPP */ diff --git a/host/include/uhd/transport/tcp_zero_copy.hpp b/host/include/uhd/transport/tcp_zero_copy.hpp index b1d052513..c834d653d 100644 --- a/host/include/uhd/transport/tcp_zero_copy.hpp +++ b/host/include/uhd/transport/tcp_zero_copy.hpp @@ -5,8 +5,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_UHD_TRANSPORT_TCP_ZERO_COPY_HPP -#define INCLUDED_UHD_TRANSPORT_TCP_ZERO_COPY_HPP +#pragma once #include <uhd/config.hpp> #include <uhd/transport/zero_copy.hpp> @@ -43,5 +42,3 @@ struct UHD_API tcp_zero_copy : public virtual zero_copy_if }; }} // namespace uhd::transport - -#endif /* INCLUDED_UHD_TRANSPORT_TCP_ZERO_COPY_HPP */ diff --git a/host/include/uhd/transport/udp_constants.hpp b/host/include/uhd/transport/udp_constants.hpp index 6fe26424f..a80a084a5 100644 --- a/host/include/uhd/transport/udp_constants.hpp +++ b/host/include/uhd/transport/udp_constants.hpp @@ -5,13 +5,10 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_UHD_TRANSPORT_UDP_CONSTANTS_HPP -#define INCLUDED_UHD_TRANSPORT_UDP_CONSTANTS_HPP +#pragma once // Constants related to UDP (over Ethernet) static const size_t IP_PROTOCOL_MIN_MTU_SIZE = 576; // bytes static const size_t IP_PROTOCOL_UDP_PLUS_IP_HEADER = 28; // bytes. Note that this is the minimum value! - -#endif /* INCLUDED_UHD_TRANSPORT_UDP_CONSTANTS_HPP */ diff --git a/host/include/uhd/transport/udp_simple.hpp b/host/include/uhd/transport/udp_simple.hpp index 52395d544..9c2e2e92d 100644 --- a/host/include/uhd/transport/udp_simple.hpp +++ b/host/include/uhd/transport/udp_simple.hpp @@ -5,8 +5,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_UHD_TRANSPORT_UDP_SIMPLE_HPP -#define INCLUDED_UHD_TRANSPORT_UDP_SIMPLE_HPP +#pragma once #include <uhd/config.hpp> #include <uhd/types/serial.hpp> @@ -94,5 +93,3 @@ public: }; }} // namespace uhd::transport - -#endif /* INCLUDED_UHD_TRANSPORT_UDP_SIMPLE_HPP */ diff --git a/host/include/uhd/transport/udp_zero_copy.hpp b/host/include/uhd/transport/udp_zero_copy.hpp index 3fb3fc396..190012238 100644 --- a/host/include/uhd/transport/udp_zero_copy.hpp +++ b/host/include/uhd/transport/udp_zero_copy.hpp @@ -5,8 +5,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_UHD_TRANSPORT_UDP_ZERO_COPY_HPP -#define INCLUDED_UHD_TRANSPORT_UDP_ZERO_COPY_HPP +#pragma once #include <uhd/config.hpp> #include <uhd/transport/zero_copy.hpp> @@ -75,5 +74,3 @@ public: }; }} // namespace uhd::transport - -#endif /* INCLUDED_UHD_TRANSPORT_UDP_ZERO_COPY_HPP */ diff --git a/host/include/uhd/transport/usb_control.hpp b/host/include/uhd/transport/usb_control.hpp index a6ad1e1c9..4d1bb7580 100644 --- a/host/include/uhd/transport/usb_control.hpp +++ b/host/include/uhd/transport/usb_control.hpp @@ -5,8 +5,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_UHD_TRANSPORT_USB_CONTROL_HPP -#define INCLUDED_UHD_TRANSPORT_USB_CONTROL_HPP +#pragma once #include <uhd/transport/usb_device_handle.hpp> #include <uhd/utils/noncopyable.hpp> @@ -59,5 +58,3 @@ public: }; }} // namespace uhd::transport - -#endif /* INCLUDED_UHD_TRANSPORT_USB_CONTROL_HPP */ diff --git a/host/include/uhd/transport/usb_device_handle.hpp b/host/include/uhd/transport/usb_device_handle.hpp index b0dea1b77..3a1446ca9 100644 --- a/host/include/uhd/transport/usb_device_handle.hpp +++ b/host/include/uhd/transport/usb_device_handle.hpp @@ -5,8 +5,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_UHD_TRANSPORT_USB_DEVICE_HANDLE_HPP -#define INCLUDED_UHD_TRANSPORT_USB_DEVICE_HANDLE_HPP +#pragma once #include <uhd/config.hpp> #include <uhd/utils/noncopyable.hpp> @@ -86,5 +85,3 @@ public: }; // namespace usb }} // namespace uhd::transport - -#endif /* INCLUDED_UHD_TRANSPORT_USB_DEVICE_HANDLE_HPP */ diff --git a/host/include/uhd/transport/usb_zero_copy.hpp b/host/include/uhd/transport/usb_zero_copy.hpp index ecb3ff148..6de0ab33e 100644 --- a/host/include/uhd/transport/usb_zero_copy.hpp +++ b/host/include/uhd/transport/usb_zero_copy.hpp @@ -5,8 +5,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_UHD_TRANSPORT_USB_ZERO_COPY_HPP -#define INCLUDED_UHD_TRANSPORT_USB_ZERO_COPY_HPP +#pragma once #include <uhd/transport/usb_device_handle.hpp> #include <uhd/transport/zero_copy.hpp> @@ -55,5 +54,3 @@ public: }; }} // namespace uhd::transport - -#endif /* INCLUDED_UHD_TRANSPORT_USB_ZERO_COPY_HPP */ diff --git a/host/include/uhd/transport/vrt_if_packet.hpp b/host/include/uhd/transport/vrt_if_packet.hpp index f357b8ceb..8635f94f0 100644 --- a/host/include/uhd/transport/vrt_if_packet.hpp +++ b/host/include/uhd/transport/vrt_if_packet.hpp @@ -5,8 +5,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_UHD_TRANSPORT_VRT_IF_PACKET_HPP -#define INCLUDED_UHD_TRANSPORT_VRT_IF_PACKET_HPP +#pragma once #include <uhd/config.hpp> #include <stdint.h> @@ -196,5 +195,3 @@ UHD_INLINE if_packet_info_t::if_packet_info_t(void) } }}} // namespace uhd::transport::vrt - -#endif /* INCLUDED_UHD_TRANSPORT_VRT_IF_PACKET_HPP */ diff --git a/host/include/uhd/transport/zero_copy.hpp b/host/include/uhd/transport/zero_copy.hpp index af4e88ee0..5f954e24e 100644 --- a/host/include/uhd/transport/zero_copy.hpp +++ b/host/include/uhd/transport/zero_copy.hpp @@ -5,8 +5,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_UHD_TRANSPORT_ZERO_COPY_HPP -#define INCLUDED_UHD_TRANSPORT_ZERO_COPY_HPP +#pragma once #include <uhd/config.hpp> #include <uhd/utils/noncopyable.hpp> @@ -198,5 +197,3 @@ public: }; }} // namespace uhd::transport - -#endif /* INCLUDED_UHD_TRANSPORT_ZERO_COPY_HPP */ diff --git a/host/include/uhd/transport/zero_copy_flow_ctrl.hpp b/host/include/uhd/transport/zero_copy_flow_ctrl.hpp index 4028e2e1d..f7ab250d8 100644 --- a/host/include/uhd/transport/zero_copy_flow_ctrl.hpp +++ b/host/include/uhd/transport/zero_copy_flow_ctrl.hpp @@ -5,8 +5,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_ZERO_COPY_FLOW_CTRL_HPP -#define INCLUDED_ZERO_COPY_FLOW_CTRL_HPP +#pragma once #include <uhd/config.hpp> #include <uhd/transport/zero_copy.hpp> @@ -44,5 +43,3 @@ public: }; }} // namespace uhd::transport - -#endif /* INCLUDED_ZERO_COPY_FLOW_CTRL_HPP */ diff --git a/host/include/uhd/types/byte_vector.hpp b/host/include/uhd/types/byte_vector.hpp index 64c0911e2..ff0324e74 100644 --- a/host/include/uhd/types/byte_vector.hpp +++ b/host/include/uhd/types/byte_vector.hpp @@ -5,8 +5,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_UHD_TYPES_BYTE_VECTOR_HPP -#define INCLUDED_UHD_TYPES_BYTE_VECTOR_HPP +#pragma once #include <uhd/config.hpp> #include <boost/range.hpp> @@ -32,5 +31,3 @@ UHD_API std::string bytes_to_string(const byte_vector_t& bytes); UHD_API byte_vector_t string_to_bytes(const std::string& str, size_t max_length); } // namespace uhd - -#endif /* INCLUDED_UHD_TYPES_BYTE_VECTOR_HPP */ diff --git a/host/include/uhd/types/component_file.hpp b/host/include/uhd/types/component_file.hpp index 905fc067f..f69fadf75 100644 --- a/host/include/uhd/types/component_file.hpp +++ b/host/include/uhd/types/component_file.hpp @@ -4,8 +4,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_UHD_USRP_COMPONENT_FILE_HPP -#define INCLUDED_UHD_USRP_COMPONENT_FILE_HPP +#pragma once #include <uhd/types/dict.hpp> #include <string> @@ -34,5 +33,3 @@ struct component_file_t typedef std::vector<component_file_t> component_files_t; }} // namespace uhd::usrp - -#endif /* INCLUDED_UHD_USRP_COMPONENT_FILE_HPP */ diff --git a/host/include/uhd/types/device_addr.hpp b/host/include/uhd/types/device_addr.hpp index 8751b3ad4..869f4a862 100644 --- a/host/include/uhd/types/device_addr.hpp +++ b/host/include/uhd/types/device_addr.hpp @@ -5,8 +5,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_UHD_TYPES_DEVICE_ADDR_HPP -#define INCLUDED_UHD_TYPES_DEVICE_ADDR_HPP +#pragma once #include <uhd/config.hpp> #include <uhd/types/dict.hpp> @@ -94,5 +93,3 @@ UHD_API device_addrs_t separate_device_addr(const device_addr_t& dev_addr); UHD_API device_addr_t combine_device_addrs(const device_addrs_t& dev_addrs); } // namespace uhd - -#endif /* INCLUDED_UHD_TYPES_DEVICE_ADDR_HPP */ diff --git a/host/include/uhd/types/dict.hpp b/host/include/uhd/types/dict.hpp index 269308c54..cad0a628b 100644 --- a/host/include/uhd/types/dict.hpp +++ b/host/include/uhd/types/dict.hpp @@ -5,8 +5,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_UHD_TYPES_DICT_HPP -#define INCLUDED_UHD_TYPES_DICT_HPP +#pragma once #include <uhd/config.hpp> #include <list> @@ -153,5 +152,3 @@ private: } // namespace uhd #include <uhd/types/dict.ipp> - -#endif /* INCLUDED_UHD_TYPES_DICT_HPP */ diff --git a/host/include/uhd/types/dict.ipp b/host/include/uhd/types/dict.ipp index 336a7dca9..b7e9407f6 100644 --- a/host/include/uhd/types/dict.ipp +++ b/host/include/uhd/types/dict.ipp @@ -6,8 +6,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_UHD_TYPES_DICT_IPP -#define INCLUDED_UHD_TYPES_DICT_IPP +#pragma once #include <uhd/exception.hpp> #include <boost/format.hpp> @@ -168,5 +167,3 @@ namespace uhd{ } } //namespace uhd - -#endif /* INCLUDED_UHD_TYPES_DICT_IPP */ diff --git a/host/include/uhd/types/direction.hpp b/host/include/uhd/types/direction.hpp index 73ef0c07f..ffa3e83fc 100644 --- a/host/include/uhd/types/direction.hpp +++ b/host/include/uhd/types/direction.hpp @@ -5,8 +5,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_UHD_TYPES_DIRECTION_HPP -#define INCLUDED_UHD_TYPES_DIRECTION_HPP +#pragma once namespace uhd { @@ -20,5 +19,3 @@ enum direction_t { }; } // namespace uhd - -#endif /* INCLUDED_UHD_TYPES_DIRECTION_HPP */ diff --git a/host/include/uhd/types/eeprom.hpp b/host/include/uhd/types/eeprom.hpp index ab8dfe590..3a7605d3c 100644 --- a/host/include/uhd/types/eeprom.hpp +++ b/host/include/uhd/types/eeprom.hpp @@ -4,8 +4,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_UHD_EEPROM_HPP -#define INCLUDED_UHD_EEPROM_HPP +#pragma once #include <map> #include <string> @@ -16,5 +15,3 @@ namespace uhd { typedef std::map<std::string, std::vector<uint8_t>> eeprom_map_t; } /* namespace uhd */ - -#endif /* INCLUDED_UHD_EEPROM_HPP */ diff --git a/host/include/uhd/types/endianness.hpp b/host/include/uhd/types/endianness.hpp index 9f9125332..457ba0cab 100644 --- a/host/include/uhd/types/endianness.hpp +++ b/host/include/uhd/types/endianness.hpp @@ -5,8 +5,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_UHD_TYPES_ENDIANNESS_HPP -#define INCLUDED_UHD_TYPES_ENDIANNESS_HPP +#pragma once #include <uhd/config.hpp> @@ -31,5 +30,3 @@ namespace uhd { enum endianness_t { ENDIANNESS_BIG, ENDIANNESS_LITTLE }; } // namespace uhd - -#endif /* INCLUDED_UHD_TYPES_ENDIANNESS_HPP */ diff --git a/host/include/uhd/types/filters.hpp b/host/include/uhd/types/filters.hpp index 076e55e89..83941ac9a 100644 --- a/host/include/uhd/types/filters.hpp +++ b/host/include/uhd/types/filters.hpp @@ -5,8 +5,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_UHD_TYPES_FILTERS_HPP -#define INCLUDED_UHD_TYPES_FILTERS_HPP +#pragma once #include <uhd/config.hpp> #include <uhd/utils/log.hpp> @@ -255,5 +254,3 @@ public: }; } // namespace uhd - -#endif /* INCLUDED_UHD_TYPES_FILTERS_HPP */ diff --git a/host/include/uhd/types/io_type.hpp b/host/include/uhd/types/io_type.hpp index 01e10142c..884598c25 100644 --- a/host/include/uhd/types/io_type.hpp +++ b/host/include/uhd/types/io_type.hpp @@ -5,8 +5,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_UHD_TYPES_IO_TYPE_HPP -#define INCLUDED_UHD_TYPES_IO_TYPE_HPP +#pragma once #include <uhd/config.hpp> @@ -64,5 +63,3 @@ public: }; } // namespace uhd - -#endif /* INCLUDED_UHD_TYPES_IO_TYPE_HPP */ diff --git a/host/include/uhd/types/mac_addr.hpp b/host/include/uhd/types/mac_addr.hpp index 316c5890c..947df2dc3 100644 --- a/host/include/uhd/types/mac_addr.hpp +++ b/host/include/uhd/types/mac_addr.hpp @@ -5,8 +5,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_UHD_TYPES_MAC_ADDR_HPP -#define INCLUDED_UHD_TYPES_MAC_ADDR_HPP +#pragma once #include <uhd/config.hpp> #include <uhd/types/serial.hpp> @@ -53,5 +52,3 @@ private: }; } // namespace uhd - -#endif /* INCLUDED_UHD_TYPES_MAC_ADDR_HPP */ diff --git a/host/include/uhd/types/metadata.h b/host/include/uhd/types/metadata.h index 623adb77f..65a01b501 100644 --- a/host/include/uhd/types/metadata.h +++ b/host/include/uhd/types/metadata.h @@ -5,8 +5,7 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -#ifndef INCLUDED_UHD_TYPES_METADATA_H -#define INCLUDED_UHD_TYPES_METADATA_H +#pragma once #include <uhd/config.h> #include <uhd/error.h> @@ -350,5 +349,3 @@ UHD_API uhd_error uhd_async_metadata_last_error( #ifdef __cplusplus } #endif - -#endif /* INCLUDED_UHD_TYPES_METADATA_H */ diff --git a/host/include/uhd/types/metadata.hpp b/host/include/uhd/types/metadata.hpp index d46123cf8..2b8f0a383 100644 --- a/host/include/uhd/types/metadata.hpp +++ b/host/include/uhd/types/metadata.hpp @@ -5,8 +5,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_UHD_TYPES_METADATA_HPP -#define INCLUDED_UHD_TYPES_METADATA_HPP +#pragma once #include <uhd/config.hpp> #include <uhd/types/time_spec.hpp> @@ -238,5 +237,3 @@ struct UHD_API async_metadata_t }; } // namespace uhd - -#endif /* INCLUDED_UHD_TYPES_METADATA_HPP */ diff --git a/host/include/uhd/types/ranges.h b/host/include/uhd/types/ranges.h index a7f12f4e6..71f3f7a42 100644 --- a/host/include/uhd/types/ranges.h +++ b/host/include/uhd/types/ranges.h @@ -5,8 +5,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_UHD_TYPES_RANGES_H -#define INCLUDED_UHD_TYPES_RANGES_H +#pragma once #include <uhd/config.h> #include <uhd/error.h> @@ -140,5 +139,3 @@ UHD_API void uhd_range_cpp_to_c( uhd_range_t *range_c ); #endif - -#endif /* INCLUDED_UHD_TYPES_RANGES_H */ diff --git a/host/include/uhd/types/ranges.hpp b/host/include/uhd/types/ranges.hpp index 982fdae98..361b0e9d3 100644 --- a/host/include/uhd/types/ranges.hpp +++ b/host/include/uhd/types/ranges.hpp @@ -5,8 +5,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_UHD_TYPES_RANGES_HPP -#define INCLUDED_UHD_TYPES_RANGES_HPP +#pragma once #include <uhd/config.hpp> #include <string> @@ -113,5 +112,3 @@ typedef meta_range_t gain_range_t; typedef meta_range_t freq_range_t; } // namespace uhd - -#endif /* INCLUDED_UHD_TYPES_RANGES_HPP */ diff --git a/host/include/uhd/types/ref_vector.hpp b/host/include/uhd/types/ref_vector.hpp index 6e710eecc..657ca8336 100644 --- a/host/include/uhd/types/ref_vector.hpp +++ b/host/include/uhd/types/ref_vector.hpp @@ -5,8 +5,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_UHD_TYPES_REF_VECTOR_HPP -#define INCLUDED_UHD_TYPES_REF_VECTOR_HPP +#pragma once #include <uhd/config.hpp> #include <cstddef> @@ -76,5 +75,3 @@ private: }; } // namespace uhd - -#endif /* INCLUDED_UHD_TYPES_REF_VECTOR_HPP */ diff --git a/host/include/uhd/types/sensors.h b/host/include/uhd/types/sensors.h index b493aa056..30d06bcfb 100644 --- a/host/include/uhd/types/sensors.h +++ b/host/include/uhd/types/sensors.h @@ -5,8 +5,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_UHD_TYPES_SENSORS_H -#define INCLUDED_UHD_TYPES_SENSORS_H +#pragma once #include <uhd/config.h> #include <uhd/error.h> @@ -231,5 +230,3 @@ UHD_API uhd_error uhd_sensor_value_last_error( #ifdef __cplusplus } #endif - -#endif /* INCLUDED_UHD_TYPES_SENSORS_H */ diff --git a/host/include/uhd/types/sensors.hpp b/host/include/uhd/types/sensors.hpp index 5423f2423..63fcc936c 100644 --- a/host/include/uhd/types/sensors.hpp +++ b/host/include/uhd/types/sensors.hpp @@ -5,8 +5,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_UHD_TYPES_SENSORS_HPP -#define INCLUDED_UHD_TYPES_SENSORS_HPP +#pragma once #include <uhd/config.hpp> #include <map> @@ -134,5 +133,3 @@ struct UHD_API sensor_value_t }; } // namespace uhd - -#endif /* INCLUDED_UHD_TYPES_SENSORS_HPP */ diff --git a/host/include/uhd/types/serial.hpp b/host/include/uhd/types/serial.hpp index a34baf5eb..13832e318 100644 --- a/host/include/uhd/types/serial.hpp +++ b/host/include/uhd/types/serial.hpp @@ -5,8 +5,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_UHD_TYPES_SERIAL_HPP -#define INCLUDED_UHD_TYPES_SERIAL_HPP +#pragma once #include <uhd/config.hpp> #include <stdint.h> @@ -181,5 +180,3 @@ public: }; } // namespace uhd - -#endif /* INCLUDED_UHD_TYPES_SERIAL_HPP */ diff --git a/host/include/uhd/types/stream_cmd.hpp b/host/include/uhd/types/stream_cmd.hpp index 747fa6a3c..bc7a21186 100644 --- a/host/include/uhd/types/stream_cmd.hpp +++ b/host/include/uhd/types/stream_cmd.hpp @@ -5,8 +5,7 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -#ifndef INCLUDED_UHD_TYPES_STREAM_CMD_HPP -#define INCLUDED_UHD_TYPES_STREAM_CMD_HPP +#pragma once #include <uhd/config.hpp> #include <uhd/types/time_spec.hpp> @@ -50,5 +49,3 @@ struct UHD_API stream_cmd_t }; } /* namespace uhd */ - -#endif /* INCLUDED_UHD_TYPES_STREAM_CMD_HPP */ diff --git a/host/include/uhd/types/string_vector.h b/host/include/uhd/types/string_vector.h index 036763158..c5daf4f80 100644 --- a/host/include/uhd/types/string_vector.h +++ b/host/include/uhd/types/string_vector.h @@ -5,8 +5,7 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -#ifndef INCLUDED_UHD_TYPES_STRING_VECTOR_H -#define INCLUDED_UHD_TYPES_STRING_VECTOR_H +#pragma once #include <uhd/config.h> #include <uhd/error.h> @@ -72,5 +71,3 @@ UHD_API uhd_error uhd_string_vector_last_error( #ifdef __cplusplus } #endif - -#endif /* INCLUDED_UHD_TYPES_STRING_VECTOR_H */ diff --git a/host/include/uhd/types/time_spec.hpp b/host/include/uhd/types/time_spec.hpp index b70616e73..eeb2aa0e9 100644 --- a/host/include/uhd/types/time_spec.hpp +++ b/host/include/uhd/types/time_spec.hpp @@ -5,8 +5,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_UHD_TYPES_TIME_SPEC_HPP -#define INCLUDED_UHD_TYPES_TIME_SPEC_HPP +#pragma once #include <uhd/config.hpp> #include <stdint.h> @@ -130,5 +129,3 @@ UHD_INLINE double time_spec_t::get_frac_secs(void) const } } // namespace uhd - -#endif /* INCLUDED_UHD_TYPES_TIME_SPEC_HPP */ diff --git a/host/include/uhd/types/tune_request.h b/host/include/uhd/types/tune_request.h index c4e483cfe..256e1ef3d 100644 --- a/host/include/uhd/types/tune_request.h +++ b/host/include/uhd/types/tune_request.h @@ -5,8 +5,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_UHD_TYPES_TUNE_REQUEST_H -#define INCLUDED_UHD_TYPES_TUNE_REQUEST_H +#pragma once #include <uhd/config.h> @@ -47,5 +46,3 @@ typedef struct { UHD_API uhd::tune_request_t uhd_tune_request_c_to_cpp(uhd_tune_request_t *tune_request_c); #endif - -#endif /* INCLUDED_UHD_TYPES_TUNE_REQUEST_H */ diff --git a/host/include/uhd/types/tune_request.hpp b/host/include/uhd/types/tune_request.hpp index c85ca95a1..86c7fdfa8 100644 --- a/host/include/uhd/types/tune_request.hpp +++ b/host/include/uhd/types/tune_request.hpp @@ -5,8 +5,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_UHD_TYPES_TUNE_REQUEST_HPP -#define INCLUDED_UHD_TYPES_TUNE_REQUEST_HPP +#pragma once #include <uhd/config.hpp> #include <uhd/types/device_addr.hpp> @@ -105,5 +104,3 @@ struct UHD_API tune_request_t }; } // namespace uhd - -#endif /* INCLUDED_UHD_TYPES_TUNE_REQUEST_HPP */ diff --git a/host/include/uhd/types/tune_result.h b/host/include/uhd/types/tune_result.h index 9623dd974..db5d863f9 100644 --- a/host/include/uhd/types/tune_result.h +++ b/host/include/uhd/types/tune_result.h @@ -5,8 +5,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_UHD_TYPES_TUNE_RESULT_H -#define INCLUDED_UHD_TYPES_TUNE_RESULT_H +#pragma once #include <uhd/config.h> @@ -46,5 +45,3 @@ UHD_API uhd::tune_result_t uhd_tune_result_c_to_cpp(uhd_tune_result_t *tune_resu UHD_API void uhd_tune_result_cpp_to_c(const uhd::tune_result_t &tune_result_cpp, uhd_tune_result_t *tune_result_c); #endif - -#endif /* INCLUDED_UHD_TYPES_TUNE_RESULT_H */ diff --git a/host/include/uhd/types/tune_result.hpp b/host/include/uhd/types/tune_result.hpp index 2860b50c6..9aa660e22 100644 --- a/host/include/uhd/types/tune_result.hpp +++ b/host/include/uhd/types/tune_result.hpp @@ -5,8 +5,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_UHD_TYPES_TUNE_RESULT_HPP -#define INCLUDED_UHD_TYPES_TUNE_RESULT_HPP +#pragma once #include <uhd/config.hpp> #include <string> @@ -75,5 +74,3 @@ struct UHD_API tune_result_t }; } // namespace uhd - -#endif /* INCLUDED_UHD_TYPES_TUNE_RESULT_HPP */ diff --git a/host/include/uhd/types/usrp_info.h b/host/include/uhd/types/usrp_info.h index 9198656eb..3bfb8c129 100644 --- a/host/include/uhd/types/usrp_info.h +++ b/host/include/uhd/types/usrp_info.h @@ -5,8 +5,7 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -#ifndef INCLUDED_UHD_TYPES_USRP_INFO_H -#define INCLUDED_UHD_TYPES_USRP_INFO_H +#pragma once #include <uhd/config.h> #include <uhd/error.h> @@ -80,5 +79,3 @@ UHD_API uhd_error uhd_usrp_tx_info_free(uhd_usrp_tx_info_t *tx_info); #ifdef __cplusplus } #endif - -#endif /* INCLUDED_UHD_TYPES_USRP_INFO_H */ diff --git a/host/include/uhd/types/wb_iface.hpp b/host/include/uhd/types/wb_iface.hpp index 2b7a6d4c5..ae56a10b2 100644 --- a/host/include/uhd/types/wb_iface.hpp +++ b/host/include/uhd/types/wb_iface.hpp @@ -5,8 +5,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_UHD_TYPES_WB_IFACE_HPP -#define INCLUDED_UHD_TYPES_WB_IFACE_HPP +#pragma once #include <uhd/config.hpp> #include <uhd/types/time_spec.hpp> @@ -85,5 +84,3 @@ public: }; } // namespace uhd - -#endif /* INCLUDED_UHD_TYPES_WB_IFACE_HPP */ diff --git a/host/include/uhd/usrp/dboard_base.hpp b/host/include/uhd/usrp/dboard_base.hpp index f6defa073..9fd789081 100644 --- a/host/include/uhd/usrp/dboard_base.hpp +++ b/host/include/uhd/usrp/dboard_base.hpp @@ -4,8 +4,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_UHD_USRP_DBOARD_BASE_HPP -#define INCLUDED_UHD_USRP_DBOARD_BASE_HPP +#pragma once #include <uhd/config.hpp> #include <uhd/property_tree.hpp> @@ -97,5 +96,3 @@ public: }; }} // namespace uhd::usrp - -#endif /* INCLUDED_UHD_USRP_DBOARD_BASE_HPP */ diff --git a/host/include/uhd/usrp/dboard_eeprom.h b/host/include/uhd/usrp/dboard_eeprom.h index 2a2fff1eb..1032913f7 100644 --- a/host/include/uhd/usrp/dboard_eeprom.h +++ b/host/include/uhd/usrp/dboard_eeprom.h @@ -5,8 +5,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_UHD_USRP_DBOARD_EEPROM_H -#define INCLUDED_UHD_USRP_DBOARD_EEPROM_H +#pragma once #include <uhd/config.h> #include <uhd/error.h> @@ -100,5 +99,3 @@ UHD_API uhd_error uhd_dboard_eeprom_last_error( #ifdef __cplusplus } #endif - -#endif /* INCLUDED_UHD_USRP_DBOARD_EEPROM_H */ diff --git a/host/include/uhd/usrp/dboard_eeprom.hpp b/host/include/uhd/usrp/dboard_eeprom.hpp index 09d220bb3..2b32e48dc 100644 --- a/host/include/uhd/usrp/dboard_eeprom.hpp +++ b/host/include/uhd/usrp/dboard_eeprom.hpp @@ -5,8 +5,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_UHD_USRP_DBOARD_EEPROM_HPP -#define INCLUDED_UHD_USRP_DBOARD_EEPROM_HPP +#pragma once #include <uhd/config.hpp> #include <uhd/types/serial.hpp> @@ -47,5 +46,3 @@ struct UHD_API dboard_eeprom_t }; }} // namespace uhd::usrp - -#endif /* INCLUDED_UHD_USRP_DBOARD_EEPROM_HPP */ diff --git a/host/include/uhd/usrp/dboard_id.hpp b/host/include/uhd/usrp/dboard_id.hpp index 2b48b0e46..c6a04400d 100644 --- a/host/include/uhd/usrp/dboard_id.hpp +++ b/host/include/uhd/usrp/dboard_id.hpp @@ -5,8 +5,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_UHD_USRP_DBOARD_ID_HPP -#define INCLUDED_UHD_USRP_DBOARD_ID_HPP +#pragma once #include <uhd/config.hpp> #include <stdint.h> @@ -83,5 +82,3 @@ private: UHD_API bool operator==(const dboard_id_t& lhs, const dboard_id_t& rhs); }} // namespace uhd::usrp - -#endif /* INCLUDED_UHD_USRP_DBOARD_ID_HPP */ diff --git a/host/include/uhd/usrp/dboard_iface.hpp b/host/include/uhd/usrp/dboard_iface.hpp index aef65f3d7..e89c4f064 100644 --- a/host/include/uhd/usrp/dboard_iface.hpp +++ b/host/include/uhd/usrp/dboard_iface.hpp @@ -5,8 +5,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_UHD_USRP_DBOARD_IFACE_HPP -#define INCLUDED_UHD_USRP_DBOARD_IFACE_HPP +#pragma once #include <uhd/config.hpp> #include <uhd/types/serial.hpp> @@ -285,5 +284,3 @@ public: }; }} // namespace uhd::usrp - -#endif /* INCLUDED_UHD_USRP_DBOARD_IFACE_HPP */ diff --git a/host/include/uhd/usrp/dboard_manager.hpp b/host/include/uhd/usrp/dboard_manager.hpp index 36f6094df..84b8969b5 100644 --- a/host/include/uhd/usrp/dboard_manager.hpp +++ b/host/include/uhd/usrp/dboard_manager.hpp @@ -4,8 +4,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_UHD_USRP_DBOARD_MANAGER_HPP -#define INCLUDED_UHD_USRP_DBOARD_MANAGER_HPP +#pragma once #include <uhd/config.hpp> #include <uhd/property_tree.hpp> @@ -159,5 +158,3 @@ public: }; }} // namespace uhd::usrp - -#endif /* INCLUDED_UHD_USRP_DBOARD_MANAGER_HPP */ diff --git a/host/include/uhd/usrp/fe_connection.hpp b/host/include/uhd/usrp/fe_connection.hpp index 0b34af40d..c2cf0a1f6 100644 --- a/host/include/uhd/usrp/fe_connection.hpp +++ b/host/include/uhd/usrp/fe_connection.hpp @@ -5,8 +5,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_UHD_USRP_FE_CONNECTION_HPP -#define INCLUDED_UHD_USRP_FE_CONNECTION_HPP +#pragma once #include <uhd/config.hpp> #include <boost/operators.hpp> @@ -123,5 +122,3 @@ private: UHD_API bool operator==(const fe_connection_t& lhs, const fe_connection_t& rhs); }} // namespace uhd::usrp - -#endif /* INCLUDED_UHD_USRP_FE_CONNECTION_HPP */ diff --git a/host/include/uhd/usrp/gpio_defs.hpp b/host/include/uhd/usrp/gpio_defs.hpp index 5cf09b496..392e65991 100644 --- a/host/include/uhd/usrp/gpio_defs.hpp +++ b/host/include/uhd/usrp/gpio_defs.hpp @@ -5,8 +5,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_LIBUHD_USRP_GPIO_DEFS_HPP -#define INCLUDED_LIBUHD_USRP_GPIO_DEFS_HPP +#pragma once namespace uhd { namespace usrp { namespace gpio_atr { @@ -18,5 +17,3 @@ enum gpio_atr_reg_t { }; }}} // namespace uhd::usrp::gpio_atr - -#endif /* INCLUDED_LIBUHD_USRP_GPIO_DEFS_HPP */ diff --git a/host/include/uhd/usrp/gps_ctrl.hpp b/host/include/uhd/usrp/gps_ctrl.hpp index 7743894c1..b7c3814f9 100644 --- a/host/include/uhd/usrp/gps_ctrl.hpp +++ b/host/include/uhd/usrp/gps_ctrl.hpp @@ -5,8 +5,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_GPS_CTRL_HPP -#define INCLUDED_GPS_CTRL_HPP +#pragma once #include <uhd/types/sensors.hpp> #include <uhd/types/serial.hpp> @@ -48,5 +47,3 @@ public: }; } // namespace uhd - -#endif /* INCLUDED_GPS_CTRL_HPP */ diff --git a/host/include/uhd/usrp/mboard_eeprom.h b/host/include/uhd/usrp/mboard_eeprom.h index 20744ca44..332cea8bc 100644 --- a/host/include/uhd/usrp/mboard_eeprom.h +++ b/host/include/uhd/usrp/mboard_eeprom.h @@ -5,8 +5,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_UHD_USRP_MBOARD_EEPROM_H -#define INCLUDED_UHD_USRP_MBOARD_EEPROM_H +#pragma once #include <uhd/config.h> #include <uhd/error.h> @@ -73,5 +72,3 @@ UHD_API uhd_error uhd_mboard_eeprom_last_error( #ifdef __cplusplus } #endif - -#endif /* INCLUDED_UHD_USRP_MBOARD_EEPROM_H */ diff --git a/host/include/uhd/usrp/mboard_eeprom.hpp b/host/include/uhd/usrp/mboard_eeprom.hpp index fcc587e08..aea2bd7eb 100644 --- a/host/include/uhd/usrp/mboard_eeprom.hpp +++ b/host/include/uhd/usrp/mboard_eeprom.hpp @@ -6,8 +6,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_UHD_USRP_MBOARD_EEPROM_HPP -#define INCLUDED_UHD_USRP_MBOARD_EEPROM_HPP +#pragma once #include <uhd/types/dict.hpp> #include <string> @@ -28,5 +27,3 @@ namespace uhd { namespace usrp { typedef uhd::dict<std::string, std::string> mboard_eeprom_t; }} // namespace uhd::usrp - -#endif /* INCLUDED_UHD_USRP_MBOARD_EEPROM_HPP */ diff --git a/host/include/uhd/usrp/multi_usrp.hpp b/host/include/uhd/usrp/multi_usrp.hpp index 93ef7d090..5d86370c6 100644 --- a/host/include/uhd/usrp/multi_usrp.hpp +++ b/host/include/uhd/usrp/multi_usrp.hpp @@ -5,8 +5,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_UHD_USRP_MULTI_USRP_HPP -#define INCLUDED_UHD_USRP_MULTI_USRP_HPP +#pragma once // define API capabilities for compile time detection of new features #define UHD_USRP_MULTI_USRP_REF_SOURCES_API @@ -1638,5 +1637,3 @@ public: } // namespace usrp } // namespace uhd - -#endif /* INCLUDED_UHD_USRP_MULTI_USRP_HPP */ diff --git a/host/include/uhd/usrp/subdev_spec.h b/host/include/uhd/usrp/subdev_spec.h index 96573e179..5b6986d59 100644 --- a/host/include/uhd/usrp/subdev_spec.h +++ b/host/include/uhd/usrp/subdev_spec.h @@ -5,8 +5,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_UHD_USRP_SUBDEV_SPEC_H -#define INCLUDED_UHD_USRP_SUBDEV_SPEC_H +#pragma once #include <uhd/config.h> #include <uhd/error.h> @@ -123,5 +122,3 @@ UHD_API void uhd_subdev_spec_pair_cpp_to_c( uhd_subdev_spec_pair_t *subdev_spec_pair_c ); #endif - -#endif /* INCLUDED_UHD_USRP_SUBDEV_SPEC_H */ diff --git a/host/include/uhd/usrp/subdev_spec.hpp b/host/include/uhd/usrp/subdev_spec.hpp index eb526e536..e4d8fbbdc 100644 --- a/host/include/uhd/usrp/subdev_spec.hpp +++ b/host/include/uhd/usrp/subdev_spec.hpp @@ -5,8 +5,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_UHD_USRP_SUBDEV_SPEC_HPP -#define INCLUDED_UHD_USRP_SUBDEV_SPEC_HPP +#pragma once #include <uhd/config.hpp> #include <boost/operators.hpp> @@ -81,5 +80,3 @@ public: }; }} // namespace uhd::usrp - -#endif /* INCLUDED_UHD_USRP_SUBDEV_SPEC_HPP */ diff --git a/host/include/uhd/usrp/usrp.h b/host/include/uhd/usrp/usrp.h index ac551a2a9..4bbd3ca04 100644 --- a/host/include/uhd/usrp/usrp.h +++ b/host/include/uhd/usrp/usrp.h @@ -5,8 +5,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_UHD_USRP_H -#define INCLUDED_UHD_USRP_H +#pragma once #include <uhd/config.h> #include <uhd/error.h> @@ -1274,5 +1273,3 @@ UHD_API uhd_error uhd_usrp_read_register( #ifdef __cplusplus } #endif - -#endif /* INCLUDED_UHD_USRP_H */ diff --git a/host/include/uhd/usrp_clock/multi_usrp_clock.hpp b/host/include/uhd/usrp_clock/multi_usrp_clock.hpp index 6faa10714..8cff3707d 100644 --- a/host/include/uhd/usrp_clock/multi_usrp_clock.hpp +++ b/host/include/uhd/usrp_clock/multi_usrp_clock.hpp @@ -5,8 +5,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_UHD_MULTI_USRP_CLOCK_HPP -#define INCLUDED_UHD_MULTI_USRP_CLOCK_HPP +#pragma once #include <uhd/config.hpp> #include <uhd/device.hpp> @@ -92,5 +91,3 @@ public: }; }} // namespace uhd::usrp_clock - -#endif /* INCLUDED_UHD_MULTI_USRP_CLOCK_HPP */ diff --git a/host/include/uhd/usrp_clock/octoclock_eeprom.hpp b/host/include/uhd/usrp_clock/octoclock_eeprom.hpp index af4df2d5f..a77b8adb4 100644 --- a/host/include/uhd/usrp_clock/octoclock_eeprom.hpp +++ b/host/include/uhd/usrp_clock/octoclock_eeprom.hpp @@ -5,8 +5,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_UHD_USRP_CLOCK_OCTOCLOCK_EEPROM_HPP -#define INCLUDED_UHD_USRP_CLOCK_OCTOCLOCK_EEPROM_HPP +#pragma once #include <uhd/config.hpp> #include <uhd/transport/udp_simple.hpp> @@ -49,5 +48,3 @@ private: }; }} // namespace uhd::usrp_clock - -#endif /* INCLUDED_UHD_USRP_CLOCK_OCTOCLOCK_EEPROM_HPP */ diff --git a/host/include/uhd/usrp_clock/usrp_clock.h b/host/include/uhd/usrp_clock/usrp_clock.h index d202f85cc..a7bbc0129 100644 --- a/host/include/uhd/usrp_clock/usrp_clock.h +++ b/host/include/uhd/usrp_clock/usrp_clock.h @@ -5,8 +5,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_UHD_USRP_CLOCK_H -#define INCLUDED_UHD_USRP_CLOCK_H +#pragma once #include <uhd/config.h> #include <uhd/error.h> @@ -111,5 +110,3 @@ UHD_API uhd_error uhd_usrp_clock_get_sensor_names( #ifdef __cplusplus } #endif - -#endif /* INCLUDED_UHD_USRP_CLOCK_H */ diff --git a/host/include/uhd/utils/algorithm.hpp b/host/include/uhd/utils/algorithm.hpp index 54946f8da..dd0b02902 100644 --- a/host/include/uhd/utils/algorithm.hpp +++ b/host/include/uhd/utils/algorithm.hpp @@ -5,8 +5,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_UHD_UTILS_ALGORITHM_HPP -#define INCLUDED_UHD_UTILS_ALGORITHM_HPP +#pragma once #include <uhd/config.hpp> #include <stdint.h> @@ -91,5 +90,3 @@ UHD_INLINE T clip(const T& val, const T& bound1, const T& bound2) } } // namespace uhd - -#endif /* INCLUDED_UHD_UTILS_ALGORITHM_HPP */ diff --git a/host/include/uhd/utils/assert_has.hpp b/host/include/uhd/utils/assert_has.hpp index 281c61ddf..bda9b1cca 100644 --- a/host/include/uhd/utils/assert_has.hpp +++ b/host/include/uhd/utils/assert_has.hpp @@ -5,8 +5,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_UHD_UTILS_ASSERT_HAS_HPP -#define INCLUDED_UHD_UTILS_ASSERT_HAS_HPP +#pragma once #include <uhd/config.hpp> #include <string> @@ -30,5 +29,3 @@ void assert_has(const Range& range, const T& value, const std::string& what = "u } // namespace uhd #include <uhd/utils/assert_has.ipp> - -#endif /* INCLUDED_UHD_UTILS_ASSERT_HAS_HPP */ diff --git a/host/include/uhd/utils/assert_has.ipp b/host/include/uhd/utils/assert_has.ipp index a60697f72..452a8f5b2 100644 --- a/host/include/uhd/utils/assert_has.ipp +++ b/host/include/uhd/utils/assert_has.ipp @@ -5,8 +5,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_UHD_UTILS_ASSERT_HAS_IPP -#define INCLUDED_UHD_UTILS_ASSERT_HAS_IPP +#pragma once #include <uhd/utils/algorithm.hpp> #include <uhd/exception.hpp> @@ -38,5 +37,3 @@ namespace uhd{ } }//namespace uhd - -#endif /* INCLUDED_UHD_UTILS_ASSERT_HAS_IPP */ diff --git a/host/include/uhd/utils/byteswap.hpp b/host/include/uhd/utils/byteswap.hpp index 3c90a6c3e..13fdc988e 100644 --- a/host/include/uhd/utils/byteswap.hpp +++ b/host/include/uhd/utils/byteswap.hpp @@ -5,8 +5,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_UHD_UTILS_BYTESWAP_HPP -#define INCLUDED_UHD_UTILS_BYTESWAP_HPP +#pragma once #include <uhd/config.hpp> #include <uhd/types/endianness.hpp> @@ -53,5 +52,3 @@ T htowx(T); } // namespace uhd #include <uhd/utils/byteswap.ipp> - -#endif /* INCLUDED_UHD_UTILS_BYTESWAP_HPP */ diff --git a/host/include/uhd/utils/byteswap.ipp b/host/include/uhd/utils/byteswap.ipp index 7e13d6260..85c11b8f4 100644 --- a/host/include/uhd/utils/byteswap.ipp +++ b/host/include/uhd/utils/byteswap.ipp @@ -5,8 +5,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_UHD_UTILS_BYTESWAP_IPP -#define INCLUDED_UHD_UTILS_BYTESWAP_IPP +#pragma once /*********************************************************************** * Platform-specific implementation details for byteswap below: @@ -146,5 +145,3 @@ template <typename T> UHD_INLINE T htowx(T num) } } /* namespace uhd */ - -#endif /* INCLUDED_UHD_UTILS_BYTESWAP_IPP */ diff --git a/host/include/uhd/utils/cast.hpp b/host/include/uhd/utils/cast.hpp index 7bfb05a4c..8ab0a4e75 100644 --- a/host/include/uhd/utils/cast.hpp +++ b/host/include/uhd/utils/cast.hpp @@ -6,8 +6,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_UHD_UTILS_CAST_HPP -#define INCLUDED_UHD_UTILS_CAST_HPP +#pragma once #include <uhd/config.hpp> #include <uhd/exception.hpp> @@ -62,5 +61,3 @@ template <> UHD_API std::string from_str(const std::string& val); }} // namespace uhd::cast - -#endif /* INCLUDED_UHD_UTILS_CAST_HPP */ diff --git a/host/include/uhd/utils/csv.hpp b/host/include/uhd/utils/csv.hpp index 90933d416..0807255d2 100644 --- a/host/include/uhd/utils/csv.hpp +++ b/host/include/uhd/utils/csv.hpp @@ -5,8 +5,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_UHD_UTILS_CSV_HPP -#define INCLUDED_UHD_UTILS_CSV_HPP +#pragma once #include <uhd/config.hpp> #include <istream> @@ -21,5 +20,3 @@ typedef std::vector<row_type> rows_type; UHD_API rows_type to_rows(std::istream& input); }} // namespace uhd::csv - -#endif /* INCLUDED_UHD_UTILS_CSV_HPP */ diff --git a/host/include/uhd/utils/dirty_tracked.hpp b/host/include/uhd/utils/dirty_tracked.hpp index 2d5403ce6..bc6c4fa95 100644 --- a/host/include/uhd/utils/dirty_tracked.hpp +++ b/host/include/uhd/utils/dirty_tracked.hpp @@ -5,8 +5,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_UHD_UTILS_DIRTY_TRACKED_HPP -#define INCLUDED_UHD_UTILS_DIRTY_TRACKED_HPP +#pragma once namespace uhd { /*! @@ -124,5 +123,3 @@ private: }; } // namespace uhd - -#endif /* INCLUDED_UHD_UTILS_DIRTY_TRACKED_HPP */ diff --git a/host/include/uhd/utils/fp_compare_delta.ipp b/host/include/uhd/utils/fp_compare_delta.ipp index a9734c8c1..d91fe7a69 100644 --- a/host/include/uhd/utils/fp_compare_delta.ipp +++ b/host/include/uhd/utils/fp_compare_delta.ipp @@ -9,8 +9,7 @@ #include <cmath> #include <typeinfo> -#ifndef INCLUDED_UHD_UTILS_FLOAT_COMPARE_DELTA_IPP -#define INCLUDED_UHD_UTILS_FLOAT_COMPARE_DELTA_IPP +#pragma once namespace uhd { namespace math { namespace fp_compare { @@ -161,5 +160,3 @@ namespace uhd { namespace math { namespace fp_compare { } } } } //namespace uhd::math::fp_compare - -#endif /* INCLUDED_UHD_UTILS_FLOAT_COMPARE_DELTA_IPP */ diff --git a/host/include/uhd/utils/fp_compare_epsilon.ipp b/host/include/uhd/utils/fp_compare_epsilon.ipp index bbd702512..99e467df4 100644 --- a/host/include/uhd/utils/fp_compare_epsilon.ipp +++ b/host/include/uhd/utils/fp_compare_epsilon.ipp @@ -9,8 +9,7 @@ #include <cmath> #include <typeinfo> -#ifndef INCLUDED_UHD_UTILS_FP_COMPARE_EPSILON_IPP -#define INCLUDED_UHD_UTILS_FP_COMPARE_EPSILON_IPP +#pragma once namespace uhd { namespace math { namespace fp_compare { @@ -163,5 +162,3 @@ namespace uhd { namespace math { namespace fp_compare { } } } } //namespace uhd::math::fp_compare - -#endif /* INCLUDED_UHD_UTILS_FP_COMPARE_EPSILON_IPP */ diff --git a/host/include/uhd/utils/gain_group.hpp b/host/include/uhd/utils/gain_group.hpp index 5901d71bb..5f96997f2 100644 --- a/host/include/uhd/utils/gain_group.hpp +++ b/host/include/uhd/utils/gain_group.hpp @@ -5,8 +5,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_UHD_UTILS_GAIN_GROUP_HPP -#define INCLUDED_UHD_UTILS_GAIN_GROUP_HPP +#pragma once #include <uhd/config.hpp> #include <uhd/types/ranges.hpp> @@ -100,5 +99,3 @@ public: }; } // namespace uhd - -#endif /* INCLUDED_UHD_UTILS_GAIN_GROUP_HPP */ diff --git a/host/include/uhd/utils/graph_utils.hpp b/host/include/uhd/utils/graph_utils.hpp index 1cdfe389c..6a1c9cb48 100644 --- a/host/include/uhd/utils/graph_utils.hpp +++ b/host/include/uhd/utils/graph_utils.hpp @@ -4,8 +4,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_UHD_UTILS_GRAPH_UTILS_HPP -#define INCLUDED_UHD_UTILS_GRAPH_UTILS_HPP +#pragma once #include <uhd/config.hpp> #include <uhd/rfnoc/block_id.hpp> @@ -65,5 +64,3 @@ void UHD_API connect_through_blocks(rfnoc_graph::sptr graph, const size_t dst_port); }} // namespace uhd::rfnoc - -#endif /* INCLUDED_UHD_UTILS_GRAPH_UTILS_HPP */ diff --git a/host/include/uhd/utils/interpolation.hpp b/host/include/uhd/utils/interpolation.hpp index 42a7d8fb1..f78e278ac 100644 --- a/host/include/uhd/utils/interpolation.hpp +++ b/host/include/uhd/utils/interpolation.hpp @@ -4,13 +4,10 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_UHD_INTERP_HPP -#define INCLUDED_UHD_INTERP_HPP +#pragma once namespace uhd { namespace math { enum class interp_mode { NEAREST_NEIGHBOR, LINEAR }; }} // namespace uhd::math - -#endif /* INCLUDED_UHD_INTERP_HPP */ diff --git a/host/include/uhd/utils/log.h b/host/include/uhd/utils/log.h index cc48c7df6..f331f416c 100644 --- a/host/include/uhd/utils/log.h +++ b/host/include/uhd/utils/log.h @@ -4,8 +4,7 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -#ifndef INCLUDED_UHD_UTILS_LOG_H -#define INCLUDED_UHD_UTILS_LOG_H +#pragma once #include <uhd/config.h> @@ -81,5 +80,3 @@ extern "C" { #endif #endif /* #ifndef __cplusplus */ - -#endif /* INCLUDED_UHD_UTILS_LOG_H */ diff --git a/host/include/uhd/utils/log.hpp b/host/include/uhd/utils/log.hpp index 9ea59d59a..ad7b5fb8e 100644 --- a/host/include/uhd/utils/log.hpp +++ b/host/include/uhd/utils/log.hpp @@ -5,8 +5,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_UHD_UTILS_LOG_HPP -#define INCLUDED_UHD_UTILS_LOG_HPP +#pragma once #include <uhd/config.hpp> #include <boost/current_function.hpp> @@ -313,5 +312,3 @@ public: } // namespace _log //! \endcond } /* namespace uhd */ - -#endif /* INCLUDED_UHD_UTILS_LOG_HPP */ diff --git a/host/include/uhd/utils/log_add.hpp b/host/include/uhd/utils/log_add.hpp index 36a34523e..e5f534004 100644 --- a/host/include/uhd/utils/log_add.hpp +++ b/host/include/uhd/utils/log_add.hpp @@ -6,8 +6,7 @@ // Note: Including this file requires C++11 features enabled. -#ifndef INCLUDED_UHD_UTILS_LOG_ADD_HPP -#define INCLUDED_UHD_UTILS_LOG_ADD_HPP +#pragma once #include <uhd/config.hpp> #include <uhd/utils/log.hpp> @@ -29,5 +28,3 @@ typedef std::function<void(const uhd::log::logging_info&)> log_fn_t; */ UHD_API void add_logger(const std::string& key, log_fn_t logger_fn); }} /* namespace uhd::log */ - -#endif /* INCLUDED_UHD_UTILS_LOG_ADD_HPP */ diff --git a/host/include/uhd/utils/math.hpp b/host/include/uhd/utils/math.hpp index f5aef5ea1..aca0b7c92 100644 --- a/host/include/uhd/utils/math.hpp +++ b/host/include/uhd/utils/math.hpp @@ -5,8 +5,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_UHD_UTILS_MATH_HPP -#define INCLUDED_UHD_UTILS_MATH_HPP +#pragma once #include <uhd/config.hpp> #include <uhd/exception.hpp> @@ -256,5 +255,3 @@ inline IntegerType gcd(IntegerType x, IntegerType y) #include <uhd/utils/fp_compare_delta.ipp> #include <uhd/utils/fp_compare_epsilon.ipp> - -#endif /* INCLUDED_UHD_UTILS_MATH_HPP */ diff --git a/host/include/uhd/utils/msg_task.hpp b/host/include/uhd/utils/msg_task.hpp index 9b8b5b23d..0257c52e0 100644 --- a/host/include/uhd/utils/msg_task.hpp +++ b/host/include/uhd/utils/msg_task.hpp @@ -6,8 +6,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_UHD_UTILS_MSG_TASK_HPP -#define INCLUDED_UHD_UTILS_MSG_TASK_HPP +#pragma once #include <uhd/config.hpp> #include <uhd/transport/zero_copy.hpp> @@ -66,5 +65,3 @@ public: static sptr make(const task_fcn_type& task_fcn); }; } // namespace uhd - -#endif /* INCLUDED_UHD_UTILS_MSG_TASK_HPP */ diff --git a/host/include/uhd/utils/noncopyable.hpp b/host/include/uhd/utils/noncopyable.hpp index b2aabdcec..3c930177b 100644 --- a/host/include/uhd/utils/noncopyable.hpp +++ b/host/include/uhd/utils/noncopyable.hpp @@ -4,8 +4,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_UHDLIB_UTILS_NONCOPYABLE_HPP -#define INCLUDED_UHDLIB_UTILS_NONCOPYABLE_HPP +#pragma once #ifdef UHD_AVOID_BOOST @@ -47,5 +46,3 @@ typedef boost::noncopyable noncopyable; } #endif - -#endif /* INCLUDED_UHDLIB_UTILS_NONCOPYABLE_HPP */ diff --git a/host/include/uhd/utils/paths.hpp b/host/include/uhd/utils/paths.hpp index 8bcf22171..e022afe1a 100644 --- a/host/include/uhd/utils/paths.hpp +++ b/host/include/uhd/utils/paths.hpp @@ -5,8 +5,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_UHD_UTILS_PATHS_HPP -#define INCLUDED_UHD_UTILS_PATHS_HPP +#pragma once #include <uhd/config.hpp> #include <boost/filesystem.hpp> @@ -82,5 +81,3 @@ UHD_API std::string find_utility(const std::string& name); UHD_API std::string print_utility_error( const std::string& name, const std::string& args = ""); } // namespace uhd - -#endif /* INCLUDED_UHD_UTILS_PATHS_HPP */ diff --git a/host/include/uhd/utils/pimpl.hpp b/host/include/uhd/utils/pimpl.hpp index b0fbf7fec..859353216 100644 --- a/host/include/uhd/utils/pimpl.hpp +++ b/host/include/uhd/utils/pimpl.hpp @@ -5,8 +5,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_UHD_UTILS_PIMPL_HPP -#define INCLUDED_UHD_UTILS_PIMPL_HPP +#pragma once #include <uhd/config.hpp> #include <memory> @@ -41,5 +40,3 @@ * \param _args the constructor args for the pimpl */ #define UHD_PIMPL_MAKE(_name, _args) std::shared_ptr<_name>(new _name _args) - -#endif /* INCLUDED_UHD_UTILS_PIMPL_HPP */ diff --git a/host/include/uhd/utils/platform.hpp b/host/include/uhd/utils/platform.hpp index 1d8d58b26..089801a36 100644 --- a/host/include/uhd/utils/platform.hpp +++ b/host/include/uhd/utils/platform.hpp @@ -5,8 +5,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_UHD_UTILS_PLATFORM_HPP -#define INCLUDED_UHD_UTILS_PLATFORM_HPP +#pragma once #include <stdint.h> @@ -22,5 +21,3 @@ uint32_t get_host_id(); uint32_t get_process_hash(); } // namespace uhd - -#endif /* INCLUDED_UHD_UTILS_PLATFORM_HPP */ diff --git a/host/include/uhd/utils/safe_call.hpp b/host/include/uhd/utils/safe_call.hpp index 2688c5d68..f19a0926a 100644 --- a/host/include/uhd/utils/safe_call.hpp +++ b/host/include/uhd/utils/safe_call.hpp @@ -5,8 +5,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_UHD_UTILS_SAFE_CALL_HPP -#define INCLUDED_UHD_UTILS_SAFE_CALL_HPP +#pragma once #include <uhd/config.hpp> #include <uhd/exception.hpp> @@ -31,5 +30,3 @@ } catch (...) { \ _UHD_SAFE_CALL_WARNING(code, "unknown exception"); \ } - -#endif /* INCLUDED_UHD_UTILS_SAFE_CALL_HPP */ diff --git a/host/include/uhd/utils/safe_main.hpp b/host/include/uhd/utils/safe_main.hpp index ca00a97dd..121818521 100644 --- a/host/include/uhd/utils/safe_main.hpp +++ b/host/include/uhd/utils/safe_main.hpp @@ -5,8 +5,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_UHD_UTILS_SAFE_MAIN_HPP -#define INCLUDED_UHD_UTILS_SAFE_MAIN_HPP +#pragma once #include <uhd/config.hpp> #include <iostream> @@ -33,5 +32,3 @@ return ~0; \ } \ int _main(_argc, _argv) - -#endif /* INCLUDED_UHD_UTILS_SAFE_MAIN_HPP */ diff --git a/host/include/uhd/utils/scope_exit.hpp b/host/include/uhd/utils/scope_exit.hpp index 0e4a01382..47729c049 100644 --- a/host/include/uhd/utils/scope_exit.hpp +++ b/host/include/uhd/utils/scope_exit.hpp @@ -4,8 +4,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_UHD_SCOPE_EXIT_HPP -#define INCLUDED_UHD_SCOPE_EXIT_HPP +#pragma once #include <functional> #include <memory> @@ -50,5 +49,3 @@ private: }; }} // namespace uhd::utils - -#endif /* INCLUDED_UHD_SCOPE_EXIT_HPP */ diff --git a/host/include/uhd/utils/soft_register.hpp b/host/include/uhd/utils/soft_register.hpp index 7e7916f62..45dd9d573 100644 --- a/host/include/uhd/utils/soft_register.hpp +++ b/host/include/uhd/utils/soft_register.hpp @@ -5,8 +5,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_UHD_UTILS_SOFT_REGISTER_HPP -#define INCLUDED_UHD_UTILS_SOFT_REGISTER_HPP +#pragma once #include <uhd/exception.hpp> #include <uhd/types/wb_iface.hpp> @@ -705,5 +704,3 @@ private: }; } // namespace uhd - -#endif /* INCLUDED_UHD_UTILS_SOFT_REGISTER_HPP */ diff --git a/host/include/uhd/utils/static.hpp b/host/include/uhd/utils/static.hpp index 6a6f24721..7120ce966 100644 --- a/host/include/uhd/utils/static.hpp +++ b/host/include/uhd/utils/static.hpp @@ -5,8 +5,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_UHD_UTILS_STATIC_HPP -#define INCLUDED_UHD_UTILS_STATIC_HPP +#pragma once #include <uhd/config.hpp> @@ -38,5 +37,3 @@ struct UHD_API _uhd_static_fixture { _uhd_static_fixture(void (*)(void), const char*); }; - -#endif /* INCLUDED_UHD_UTILS_STATIC_HPP */ diff --git a/host/include/uhd/utils/tasks.hpp b/host/include/uhd/utils/tasks.hpp index 456af25e6..0f1cdb640 100644 --- a/host/include/uhd/utils/tasks.hpp +++ b/host/include/uhd/utils/tasks.hpp @@ -7,8 +7,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_UHD_UTILS_TASKS_HPP -#define INCLUDED_UHD_UTILS_TASKS_HPP +#pragma once #include <uhd/config.hpp> #include <uhd/utils/noncopyable.hpp> @@ -39,5 +38,3 @@ public: static sptr make(const task_fcn_type& task_fcn, const std::string& name = ""); }; } // namespace uhd - -#endif /* INCLUDED_UHD_UTILS_TASKS_HPP */ diff --git a/host/include/uhd/utils/thread.hpp b/host/include/uhd/utils/thread.hpp index 33c8c2aae..88abe7472 100644 --- a/host/include/uhd/utils/thread.hpp +++ b/host/include/uhd/utils/thread.hpp @@ -5,8 +5,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_UHD_UTILS_THREAD_HPP -#define INCLUDED_UHD_UTILS_THREAD_HPP +#pragma once #include <uhd/config.hpp> #include <boost/thread/thread.hpp> @@ -65,5 +64,3 @@ UHD_API void set_thread_name(std::thread* thread, const std::string& name); UHD_API void set_thread_affinity(const std::vector<size_t>& cpu_affinity_list); } // namespace uhd - -#endif /* INCLUDED_UHD_UTILS_THREAD_HPP */ diff --git a/host/include/uhd/utils/thread_priority.h b/host/include/uhd/utils/thread_priority.h index ef2f2ed77..dbb756595 100644 --- a/host/include/uhd/utils/thread_priority.h +++ b/host/include/uhd/utils/thread_priority.h @@ -5,8 +5,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_UHD_UTILS_THREAD_PRIORITY_H -#define INCLUDED_UHD_UTILS_THREAD_PRIORITY_H +#pragma once #include <uhd/config.h> #include <uhd/error.h> @@ -39,5 +38,3 @@ UHD_API uhd_error uhd_set_thread_priority( #ifdef __cplusplus } #endif - -#endif /* INCLUDED_UHD_UTILS_THREAD_PRIORITY_H */ diff --git a/host/include/uhd/utils/thread_priority.hpp b/host/include/uhd/utils/thread_priority.hpp index 6abea98c5..9cb281acb 100644 --- a/host/include/uhd/utils/thread_priority.hpp +++ b/host/include/uhd/utils/thread_priority.hpp @@ -5,8 +5,6 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_UHD_UTILS_THREAD_PRIORITY_HPP -#define INCLUDED_UHD_UTILS_THREAD_PRIORITY_HPP +#pragma once #pragma message "This header is deprecated - please use <uhd/utils/thread.hpp> instead." #include <uhd/utils/thread.hpp> -#endif /* INCLUDED_UHD_UTILS_THREAD_PRIORITY_HPP */ diff --git a/host/include/uhd/version.h b/host/include/uhd/version.h index b67098b36..9d2b25154 100644 --- a/host/include/uhd/version.h +++ b/host/include/uhd/version.h @@ -4,8 +4,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_UHD_VERSION_H -#define INCLUDED_UHD_VERSION_H +#pragma once #include <uhd/config.h> #include <uhd/error.h> @@ -31,5 +30,3 @@ UHD_API uhd_error uhd_get_version_string( #ifdef __cplusplus } #endif - -#endif /* INCLUDED_UHD_VERSION_H */ diff --git a/host/include/uhd/version.hpp.in b/host/include/uhd/version.hpp.in index 41abe99e9..f7996dbdd 100644 --- a/host/include/uhd/version.hpp.in +++ b/host/include/uhd/version.hpp.in @@ -5,8 +5,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_UHD_VERSION_HPP -#define INCLUDED_UHD_VERSION_HPP +#pragma once /*! * The ABI version string that the client application builds against. @@ -40,5 +39,3 @@ namespace uhd{ } //namespace uhd #endif - -#endif /* INCLUDED_UHD_VERSION_HPP */ diff --git a/host/lib/include/uhdlib/experts/expert_container.hpp b/host/lib/include/uhdlib/experts/expert_container.hpp index 0beae5504..a0245d598 100644 --- a/host/lib/include/uhdlib/experts/expert_container.hpp +++ b/host/lib/include/uhdlib/experts/expert_container.hpp @@ -5,8 +5,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_UHD_EXPERTS_EXPERT_CONTAINER_HPP -#define INCLUDED_UHD_EXPERTS_EXPERT_CONTAINER_HPP +#pragma once #include <uhd/config.hpp> #include <uhd/utils/noncopyable.hpp> @@ -192,5 +191,3 @@ private: }; }} // namespace uhd::experts - -#endif /* INCLUDED_UHD_EXPERTS_EXPERT_CONTAINER_HPP */ diff --git a/host/lib/include/uhdlib/experts/expert_factory.hpp b/host/lib/include/uhdlib/experts/expert_factory.hpp index 47308d046..4568abd61 100644 --- a/host/lib/include/uhdlib/experts/expert_factory.hpp +++ b/host/lib/include/uhdlib/experts/expert_factory.hpp @@ -5,8 +5,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_UHD_EXPERTS_EXPERT_FACTORY_HPP -#define INCLUDED_UHD_EXPERTS_EXPERT_FACTORY_HPP +#pragma once #include <uhd/config.hpp> #include <uhd/property_tree.hpp> @@ -346,5 +345,3 @@ public: } }; }} // namespace uhd::experts - -#endif /* INCLUDED_UHD_EXPERTS_EXPERT_FACTORY_HPP */ diff --git a/host/lib/include/uhdlib/experts/expert_nodes.hpp b/host/lib/include/uhdlib/experts/expert_nodes.hpp index b9a0f57bd..7b8a62110 100644 --- a/host/lib/include/uhdlib/experts/expert_nodes.hpp +++ b/host/lib/include/uhdlib/experts/expert_nodes.hpp @@ -5,8 +5,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_UHD_EXPERTS_EXPERT_NODES_HPP -#define INCLUDED_UHD_EXPERTS_EXPERT_NODES_HPP +#pragma once #include <uhd/config.hpp> #include <uhd/exception.hpp> @@ -549,5 +548,3 @@ private: }; }} // namespace uhd::experts - -#endif /* INCLUDED_UHD_EXPERTS_EXPERT_NODE_HPP */ diff --git a/host/lib/include/uhdlib/rfnoc/async_msg.hpp b/host/lib/include/uhdlib/rfnoc/async_msg.hpp index 988801dc3..88c2aa683 100644 --- a/host/lib/include/uhdlib/rfnoc/async_msg.hpp +++ b/host/lib/include/uhdlib/rfnoc/async_msg.hpp @@ -4,8 +4,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_UHD_RFNOC_ASYNC_MSG_HPP -#define INCLUDED_UHD_RFNOC_ASYNC_MSG_HPP +#pragma once #include <uhd/config.hpp> #include <uhd/types/sid.hpp> @@ -84,4 +83,3 @@ struct async_msg_t }; }} // namespace uhd::rfnoc -#endif /* INCLUDED_UHD_RFNOC_ASYNC_MSG_HPP */ diff --git a/host/lib/include/uhdlib/rfnoc/block_container.hpp b/host/lib/include/uhdlib/rfnoc/block_container.hpp index 800902d06..e84eea690 100644 --- a/host/lib/include/uhdlib/rfnoc/block_container.hpp +++ b/host/lib/include/uhdlib/rfnoc/block_container.hpp @@ -4,8 +4,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_LIBUHD_BLOCK_CONTAINER_HPP -#define INCLUDED_LIBUHD_BLOCK_CONTAINER_HPP +#pragma once #include <uhd/rfnoc/block_id.hpp> #include <uhd/rfnoc/noc_block_base.hpp> @@ -62,5 +61,3 @@ private: }; }}} /* namespace uhd::rfnoc::detail */ - -#endif /* INCLUDED_LIBUHD_BLOCK_CONTAINER_HPP */ diff --git a/host/lib/include/uhdlib/rfnoc/chdr_ctrl_endpoint.hpp b/host/lib/include/uhdlib/rfnoc/chdr_ctrl_endpoint.hpp index 1281cc0ea..6f56fd956 100644 --- a/host/lib/include/uhdlib/rfnoc/chdr_ctrl_endpoint.hpp +++ b/host/lib/include/uhdlib/rfnoc/chdr_ctrl_endpoint.hpp @@ -4,8 +4,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_LIBUHD_RFNOC_CHDR_CTRL_ENDPOINT_HPP -#define INCLUDED_LIBUHD_RFNOC_CHDR_CTRL_ENDPOINT_HPP +#pragma once #include <uhdlib/rfnoc/chdr_ctrl_xport.hpp> #include <uhdlib/rfnoc/chdr_packet.hpp> @@ -58,5 +57,3 @@ public: }; // class chdr_ctrl_endpoint }} /* namespace uhd::rfnoc */ - -#endif /* INCLUDED_LIBUHD_RFNOC_CHDR_CTRL_ENDPOINT_HPP */ diff --git a/host/lib/include/uhdlib/rfnoc/chdr_ctrl_xport.hpp b/host/lib/include/uhdlib/rfnoc/chdr_ctrl_xport.hpp index d32ab7222..bf3e03a6b 100644 --- a/host/lib/include/uhdlib/rfnoc/chdr_ctrl_xport.hpp +++ b/host/lib/include/uhdlib/rfnoc/chdr_ctrl_xport.hpp @@ -4,8 +4,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_RFNOC_CHDR_CTRL_XPORT_HPP -#define INCLUDED_RFNOC_CHDR_CTRL_XPORT_HPP +#pragma once #include <uhdlib/rfnoc/chdr_packet.hpp> #include <uhdlib/rfnoc/chdr_types.hpp> @@ -158,5 +157,3 @@ private: }; }} // namespace uhd::rfnoc - -#endif /* INCLUDED_UHDLIB_RFNOC_CHDR_CTRL_XPORT_HPP */ diff --git a/host/lib/include/uhdlib/rfnoc/chdr_packet.hpp b/host/lib/include/uhdlib/rfnoc/chdr_packet.hpp index 355c15da2..d56f94d0f 100644 --- a/host/lib/include/uhdlib/rfnoc/chdr_packet.hpp +++ b/host/lib/include/uhdlib/rfnoc/chdr_packet.hpp @@ -4,8 +4,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_RFNOC_CHDR_PACKET_HPP -#define INCLUDED_RFNOC_CHDR_PACKET_HPP +#pragma once #include <uhd/types/endianness.hpp> #include <uhd/utils/byteswap.hpp> @@ -319,5 +318,3 @@ private: }; }}} // namespace uhd::rfnoc::chdr - -#endif /* INCLUDED_RFNOC_CHDR_PACKET_HPP */ diff --git a/host/lib/include/uhdlib/rfnoc/chdr_rx_data_xport.hpp b/host/lib/include/uhdlib/rfnoc/chdr_rx_data_xport.hpp index dab308279..caa94bde3 100644 --- a/host/lib/include/uhdlib/rfnoc/chdr_rx_data_xport.hpp +++ b/host/lib/include/uhdlib/rfnoc/chdr_rx_data_xport.hpp @@ -4,8 +4,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_LIBUHD_CHDR_RX_DATA_XPORT_HPP -#define INCLUDED_LIBUHD_CHDR_RX_DATA_XPORT_HPP +#pragma once #include <uhd/config.hpp> #include <uhd/exception.hpp> @@ -408,5 +407,3 @@ private: }; }} // namespace uhd::rfnoc - -#endif /* INCLUDED_LIBUHD_CHDR_RX_DATA_XPORT_HPP */ diff --git a/host/lib/include/uhdlib/rfnoc/chdr_tx_data_xport.hpp b/host/lib/include/uhdlib/rfnoc/chdr_tx_data_xport.hpp index 47293f44a..777066c0a 100644 --- a/host/lib/include/uhdlib/rfnoc/chdr_tx_data_xport.hpp +++ b/host/lib/include/uhdlib/rfnoc/chdr_tx_data_xport.hpp @@ -4,8 +4,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_LIBUHD_CHDR_TX_DATA_XPORT_HPP -#define INCLUDED_LIBUHD_CHDR_TX_DATA_XPORT_HPP +#pragma once #include <uhd/exception.hpp> #include <uhd/types/metadata.hpp> @@ -401,5 +400,3 @@ private: }; }} // namespace uhd::rfnoc - -#endif /* INCLUDED_LIBUHD_CHDR_TX_DATA_XPORT_HPP */ diff --git a/host/lib/include/uhdlib/rfnoc/chdr_types.hpp b/host/lib/include/uhdlib/rfnoc/chdr_types.hpp index 25a7c8905..6e650507f 100644 --- a/host/lib/include/uhdlib/rfnoc/chdr_types.hpp +++ b/host/lib/include/uhdlib/rfnoc/chdr_types.hpp @@ -4,8 +4,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_RFNOC_CHDR_TYPES_HPP -#define INCLUDED_RFNOC_CHDR_TYPES_HPP +#pragma once #include <uhd/types/endianness.hpp> #include <uhd/utils/byteswap.hpp> @@ -823,5 +822,3 @@ private: }; }}} // namespace uhd::rfnoc::chdr - -#endif /* INCLUDED_RFNOC_CHDR_TYPES_HPP */ diff --git a/host/lib/include/uhdlib/rfnoc/client_zero.hpp b/host/lib/include/uhdlib/rfnoc/client_zero.hpp index f022c2dfa..682f222c8 100644 --- a/host/lib/include/uhdlib/rfnoc/client_zero.hpp +++ b/host/lib/include/uhdlib/rfnoc/client_zero.hpp @@ -4,8 +4,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_LIBUHD_CLIENT_ZERO_HPP -#define INCLUDED_LIBUHD_CLIENT_ZERO_HPP +#pragma once #include <uhd/rfnoc/register_iface_holder.hpp> #include <uhdlib/rfnoc/chdr_ctrl_endpoint.hpp> @@ -221,5 +220,3 @@ private: }; }}} /* namespace uhd::rfnoc::detail */ - -#endif /* INCLUDED_LIBUHD_CLIENT_ZERO_HPP */ diff --git a/host/lib/include/uhdlib/rfnoc/clock_iface.hpp b/host/lib/include/uhdlib/rfnoc/clock_iface.hpp index 1a9f18bd5..344968ee4 100644 --- a/host/lib/include/uhdlib/rfnoc/clock_iface.hpp +++ b/host/lib/include/uhdlib/rfnoc/clock_iface.hpp @@ -4,8 +4,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_UHD_RFNOC_CLOCK_IFACE_HPP -#define INCLUDED_UHD_RFNOC_CLOCK_IFACE_HPP +#pragma once #include <uhd/config.hpp> #include <uhd/exception.hpp> @@ -83,5 +82,3 @@ private: }; }} // namespace uhd::rfnoc - -#endif /* INCLUDED_UHD_RFNOC_CLOCK_IFACE_HPP */ diff --git a/host/lib/include/uhdlib/rfnoc/ctrlport_endpoint.hpp b/host/lib/include/uhdlib/rfnoc/ctrlport_endpoint.hpp index 11c456775..bf81ededd 100644 --- a/host/lib/include/uhdlib/rfnoc/ctrlport_endpoint.hpp +++ b/host/lib/include/uhdlib/rfnoc/ctrlport_endpoint.hpp @@ -4,8 +4,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_LIBUHD_RFNOC_CTRLPORT_ENDPOINT_HPP -#define INCLUDED_LIBUHD_RFNOC_CTRLPORT_ENDPOINT_HPP +#pragma once #include <uhd/rfnoc/register_iface.hpp> #include <uhdlib/rfnoc/chdr_types.hpp> @@ -58,5 +57,3 @@ public: }; // class ctrlport_endpoint }} /* namespace uhd::rfnoc */ - -#endif /* INCLUDED_LIBUHD_RFNOC_CTRLPORT_ENDPOINT_HPP */ diff --git a/host/lib/include/uhdlib/rfnoc/device_id.hpp b/host/lib/include/uhdlib/rfnoc/device_id.hpp index c86dd04df..0e861cef4 100644 --- a/host/lib/include/uhdlib/rfnoc/device_id.hpp +++ b/host/lib/include/uhdlib/rfnoc/device_id.hpp @@ -4,8 +4,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_LIBUHD_DEVICE_ID_HPP -#define INCLUDED_LIBUHD_DEVICE_ID_HPP +#pragma once #include <uhdlib/rfnoc/rfnoc_common.hpp> @@ -17,5 +16,3 @@ namespace uhd { namespace rfnoc { device_id_t allocate_device_id(); }} /* namespace uhd::rfnoc */ - -#endif /* INCLUDED_LIBUHD_DEVICE_ID_HPP */ diff --git a/host/lib/include/uhdlib/rfnoc/epid_allocator.hpp b/host/lib/include/uhdlib/rfnoc/epid_allocator.hpp index 482cb1dac..40d761548 100644 --- a/host/lib/include/uhdlib/rfnoc/epid_allocator.hpp +++ b/host/lib/include/uhdlib/rfnoc/epid_allocator.hpp @@ -4,8 +4,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_LIBUHD_EPID_ALLOCATOR_HPP -#define INCLUDED_LIBUHD_EPID_ALLOCATOR_HPP +#pragma once #include <uhdlib/rfnoc/mgmt_portal.hpp> #include <uhdlib/rfnoc/rfnoc_common.hpp> @@ -74,5 +73,3 @@ private: }; }} /* namespace uhd::rfnoc */ - -#endif /* INCLUDED_LIBUHD_EPID_ALLOCATOR_HPP */ diff --git a/host/lib/include/uhdlib/rfnoc/factory.hpp b/host/lib/include/uhdlib/rfnoc/factory.hpp index 2bd1feb09..f0eb9db97 100644 --- a/host/lib/include/uhdlib/rfnoc/factory.hpp +++ b/host/lib/include/uhdlib/rfnoc/factory.hpp @@ -4,8 +4,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_LIBUHD_RFNOC_FACTORY_HPP -#define INCLUDED_LIBUHD_RFNOC_FACTORY_HPP +#pragma once #include <uhd/rfnoc/defaults.hpp> #include <uhd/rfnoc/noc_block_base.hpp> @@ -37,5 +36,3 @@ public: }; }} /* namespace uhd::rfnoc */ - -#endif /* INCLUDED_LIBUHD_RFNOC_FACTORY_HPP */ diff --git a/host/lib/include/uhdlib/rfnoc/graph.hpp b/host/lib/include/uhdlib/rfnoc/graph.hpp index e54c2fe7e..a3f6d4e28 100644 --- a/host/lib/include/uhdlib/rfnoc/graph.hpp +++ b/host/lib/include/uhdlib/rfnoc/graph.hpp @@ -4,8 +4,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_LIBUHD_GRAPH_HPP -#define INCLUDED_LIBUHD_GRAPH_HPP +#pragma once #include <uhd/rfnoc/actions.hpp> #include <uhd/rfnoc/graph_edge.hpp> @@ -293,5 +292,3 @@ private: }}} /* namespace uhd::rfnoc::detail */ - -#endif /* INCLUDED_LIBUHD_GRAPH_HPP */ diff --git a/host/lib/include/uhdlib/rfnoc/graph_stream_manager.hpp b/host/lib/include/uhdlib/rfnoc/graph_stream_manager.hpp index b9f4205ab..3e1cdeee5 100644 --- a/host/lib/include/uhdlib/rfnoc/graph_stream_manager.hpp +++ b/host/lib/include/uhdlib/rfnoc/graph_stream_manager.hpp @@ -4,8 +4,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_LIBUHD_RFNOC_GRAPH_STREAM_MANAGER_HPP -#define INCLUDED_LIBUHD_RFNOC_GRAPH_STREAM_MANAGER_HPP +#pragma once #include <uhd/stream.hpp> #include <uhd/transport/adapter_id.hpp> @@ -167,5 +166,3 @@ public: }; // class graph_stream_manager }} /* namespace uhd::rfnoc */ - -#endif /* INCLUDED_LIBUHD_RFNOC_GRAPH_STREAM_MANAGER_HPP */ diff --git a/host/lib/include/uhdlib/rfnoc/link_stream_manager.hpp b/host/lib/include/uhdlib/rfnoc/link_stream_manager.hpp index 836a50dcf..4357a2d58 100644 --- a/host/lib/include/uhdlib/rfnoc/link_stream_manager.hpp +++ b/host/lib/include/uhdlib/rfnoc/link_stream_manager.hpp @@ -4,8 +4,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_LIBUHD_RFNOC_LINK_STREAM_MANAGER_HPP -#define INCLUDED_LIBUHD_RFNOC_LINK_STREAM_MANAGER_HPP +#pragma once #include <uhd/transport/adapter_id.hpp> #include <uhdlib/rfnoc/chdr_rx_data_xport.hpp> @@ -160,5 +159,3 @@ public: }; // class link_stream_manager }} /* namespace uhd::rfnoc */ - -#endif /* INCLUDED_LIBUHD_RFNOC_LINK_STREAM_MANAGER_HPP */ diff --git a/host/lib/include/uhdlib/rfnoc/mb_iface.hpp b/host/lib/include/uhdlib/rfnoc/mb_iface.hpp index 53f0897f9..40bbc7ee4 100644 --- a/host/lib/include/uhdlib/rfnoc/mb_iface.hpp +++ b/host/lib/include/uhdlib/rfnoc/mb_iface.hpp @@ -4,8 +4,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_LIBUHD_MB_IFACE_HPP -#define INCLUDED_LIBUHD_MB_IFACE_HPP +#pragma once #include <uhd/exception.hpp> #include <uhd/transport/adapter_id.hpp> @@ -169,5 +168,3 @@ private: }; }} /* namespace uhd::rfnoc */ - -#endif /* INCLUDED_LIBUHD_MB_IFACE_HPP */ diff --git a/host/lib/include/uhdlib/rfnoc/mgmt_portal.hpp b/host/lib/include/uhdlib/rfnoc/mgmt_portal.hpp index ecb90e4e9..806c9d1ea 100644 --- a/host/lib/include/uhdlib/rfnoc/mgmt_portal.hpp +++ b/host/lib/include/uhdlib/rfnoc/mgmt_portal.hpp @@ -4,8 +4,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_LIBUHD_MGMT_PORTAL_HPP -#define INCLUDED_LIBUHD_MGMT_PORTAL_HPP +#pragma once #include <uhdlib/rfnoc/chdr_ctrl_xport.hpp> #include <uhdlib/rfnoc/chdr_packet.hpp> @@ -206,5 +205,3 @@ public: }; }}} // namespace uhd::rfnoc::mgmt - -#endif /* INCLUDED_LIBUHD_MGMT_PORTAL_HPP */ diff --git a/host/lib/include/uhdlib/rfnoc/node_accessor.hpp b/host/lib/include/uhdlib/rfnoc/node_accessor.hpp index bd4af96f4..4c63d29e2 100644 --- a/host/lib/include/uhdlib/rfnoc/node_accessor.hpp +++ b/host/lib/include/uhdlib/rfnoc/node_accessor.hpp @@ -4,8 +4,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_LIBUHD_NODE_ACCESSOR_HPP -#define INCLUDED_LIBUHD_NODE_ACCESSOR_HPP +#pragma once #include <uhd/rfnoc/actions.hpp> #include <uhd/rfnoc/node.hpp> @@ -132,5 +131,3 @@ public: }} /* namespace uhd::rfnoc */ - -#endif /* INCLUDED_LIBUHD_NODE_ACCESSOR_HPP */ diff --git a/host/lib/include/uhdlib/rfnoc/prop_accessor.hpp b/host/lib/include/uhdlib/rfnoc/prop_accessor.hpp index 2f39cbbec..6725e82b8 100644 --- a/host/lib/include/uhdlib/rfnoc/prop_accessor.hpp +++ b/host/lib/include/uhdlib/rfnoc/prop_accessor.hpp @@ -4,8 +4,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_LIBUHD_PROP_ACCESSOR_HPP -#define INCLUDED_LIBUHD_PROP_ACCESSOR_HPP +#pragma once #include <uhd/rfnoc/property.hpp> #include <uhd/utils/scope_exit.hpp> @@ -92,5 +91,3 @@ public: }} /* namespace uhd::rfnoc */ - -#endif /* INCLUDED_LIBUHD_PROP_ACCESSOR_HPP */ diff --git a/host/lib/include/uhdlib/rfnoc/reg_iface_adapter.hpp b/host/lib/include/uhdlib/rfnoc/reg_iface_adapter.hpp index f0eb78be4..5e5d06288 100644 --- a/host/lib/include/uhdlib/rfnoc/reg_iface_adapter.hpp +++ b/host/lib/include/uhdlib/rfnoc/reg_iface_adapter.hpp @@ -4,8 +4,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_LIBUHD_RFNOC_REG2WBIF_ADAPTER_HPP -#define INCLUDED_LIBUHD_RFNOC_REG2WBIF_ADAPTER_HPP +#pragma once #include <uhd/config.hpp> #include <uhd/rfnoc/register_iface.hpp> @@ -116,5 +115,3 @@ private: }} /* namespace uhd::rfnoc */ - -#endif /* INCLUDED_LIBUHD_RFNOC_REG2WBIF_ADAPTER_HPP */ diff --git a/host/lib/include/uhdlib/rfnoc/resolve_context.hpp b/host/lib/include/uhdlib/rfnoc/resolve_context.hpp index 29a2e5f6f..f3189d07c 100644 --- a/host/lib/include/uhdlib/rfnoc/resolve_context.hpp +++ b/host/lib/include/uhdlib/rfnoc/resolve_context.hpp @@ -5,8 +5,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_UHD_RFNOC_RESOLVE_CONTEXT_HPP -#define INCLUDED_UHD_RFNOC_RESOLVE_CONTEXT_HPP +#pragma once namespace uhd { namespace rfnoc { @@ -22,5 +21,3 @@ enum class resolve_context { }; }} // namespace uhd::rfnoc - -#endif /* INCLUDED_UHD_RFNOC_RESOLVE_CONTEXT_HPP */ diff --git a/host/lib/include/uhdlib/rfnoc/rfnoc_common.hpp b/host/lib/include/uhdlib/rfnoc/rfnoc_common.hpp index 226d4f069..9c4944fe2 100644 --- a/host/lib/include/uhdlib/rfnoc/rfnoc_common.hpp +++ b/host/lib/include/uhdlib/rfnoc/rfnoc_common.hpp @@ -4,8 +4,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_RFNOC_RFNOC_COMMON_HPP -#define INCLUDED_RFNOC_RFNOC_COMMON_HPP +#pragma once #include <uhd/rfnoc/defaults.hpp> #include <uhdlib/transport/link_if.hpp> @@ -101,5 +100,3 @@ constexpr uint32_t MAX_FC_HEADROOM_PKTS = (uint32_t(1) << 8) - 1; constexpr size_t MIN_NUM_FRAMES = 2; }} // namespace uhd::rfnoc - -#endif /* INCLUDED_RFNOC_RFNOC_COMMON_HPP */ diff --git a/host/lib/include/uhdlib/rfnoc/rfnoc_device.hpp b/host/lib/include/uhdlib/rfnoc/rfnoc_device.hpp index a223e17c9..4b2479ae5 100644 --- a/host/lib/include/uhdlib/rfnoc/rfnoc_device.hpp +++ b/host/lib/include/uhdlib/rfnoc/rfnoc_device.hpp @@ -4,8 +4,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_LIBUHD_RFNOC_DEVICE_HPP -#define INCLUDED_LIBUHD_RFNOC_DEVICE_HPP +#pragma once #include <uhd/device.hpp> #include <uhd/exception.hpp> @@ -69,5 +68,3 @@ private: }; // class rfnoc_device }}} // namespace uhd::rfnoc::detail - -#endif /* INCLUDED_LIBUHD_RFNOC_DEVICE_HPP */ diff --git a/host/lib/include/uhdlib/rfnoc/rfnoc_rx_streamer.hpp b/host/lib/include/uhdlib/rfnoc/rfnoc_rx_streamer.hpp index 1afe5db80..8ce3725a7 100644 --- a/host/lib/include/uhdlib/rfnoc/rfnoc_rx_streamer.hpp +++ b/host/lib/include/uhdlib/rfnoc/rfnoc_rx_streamer.hpp @@ -4,8 +4,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_LIBUHD_RFNOC_RX_STREAMER_HPP -#define INCLUDED_LIBUHD_RFNOC_RX_STREAMER_HPP +#pragma once #include <uhd/rfnoc/node.hpp> #include <uhdlib/rfnoc/chdr_rx_data_xport.hpp> @@ -113,5 +112,3 @@ private: }; }} // namespace uhd::rfnoc - -#endif /* INCLUDED_LIBUHD_RFNOC_RX_STREAMER_HPP */ diff --git a/host/lib/include/uhdlib/rfnoc/rfnoc_tx_streamer.hpp b/host/lib/include/uhdlib/rfnoc/rfnoc_tx_streamer.hpp index 3e006f7f9..ce989420c 100644 --- a/host/lib/include/uhdlib/rfnoc/rfnoc_tx_streamer.hpp +++ b/host/lib/include/uhdlib/rfnoc/rfnoc_tx_streamer.hpp @@ -4,8 +4,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_LIBUHD_RFNOC_TX_STREAMER_HPP -#define INCLUDED_LIBUHD_RFNOC_TX_STREAMER_HPP +#pragma once #include <uhd/rfnoc/node.hpp> #include <uhdlib/rfnoc/chdr_tx_data_xport.hpp> @@ -113,5 +112,3 @@ private: }; }} // namespace uhd::rfnoc - -#endif /* INCLUDED_LIBUHD_RFNOC_TX_STREAMER_HPP */ diff --git a/host/lib/include/uhdlib/rfnoc/rpc_block_ctrl.hpp b/host/lib/include/uhdlib/rfnoc/rpc_block_ctrl.hpp index 5125aef84..c9e5d6bc9 100644 --- a/host/lib/include/uhdlib/rfnoc/rpc_block_ctrl.hpp +++ b/host/lib/include/uhdlib/rfnoc/rpc_block_ctrl.hpp @@ -4,8 +4,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_LIBUHD_RFNOC_RPC_BLOCK_CTRL_HPP -#define INCLUDED_LIBUHD_RFNOC_RPC_BLOCK_CTRL_HPP +#pragma once #include <uhd/types/device_addr.hpp> #include <uhdlib/utils/rpc.hpp> @@ -33,5 +32,3 @@ public: }; }} // namespace uhd::rfnoc - -#endif /* INCLUDED_LIBUHD_RFNOC_RPC_BLOCK_CTRL_HPP */ diff --git a/host/lib/include/uhdlib/rfnoc/rx_flow_ctrl_state.hpp b/host/lib/include/uhdlib/rfnoc/rx_flow_ctrl_state.hpp index b8bb411d4..618715449 100644 --- a/host/lib/include/uhdlib/rfnoc/rx_flow_ctrl_state.hpp +++ b/host/lib/include/uhdlib/rfnoc/rx_flow_ctrl_state.hpp @@ -4,8 +4,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_LIBUHD_RFNOC_RX_FLOW_CTRL_STATE_HPP -#define INCLUDED_LIBUHD_RFNOC_RX_FLOW_CTRL_STATE_HPP +#pragma once #include <uhd/utils/log.hpp> #include <uhdlib/rfnoc/rfnoc_common.hpp> @@ -117,5 +116,3 @@ private: }; }} // namespace uhd::rfnoc - -#endif /* INCLUDED_LIBUHD_RFNOC_RX_FLOW_CTRL_STATE_HPP */ diff --git a/host/lib/include/uhdlib/rfnoc/tx_async_msg_queue.hpp b/host/lib/include/uhdlib/rfnoc/tx_async_msg_queue.hpp index 181a31754..228f4cf1e 100644 --- a/host/lib/include/uhdlib/rfnoc/tx_async_msg_queue.hpp +++ b/host/lib/include/uhdlib/rfnoc/tx_async_msg_queue.hpp @@ -4,8 +4,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_LIBUHD_TX_ASYNC_MSG_QUEUE_HPP -#define INCLUDED_LIBUHD_TX_ASYNC_MSG_QUEUE_HPP +#pragma once #include <uhd/types/metadata.hpp> #include <boost/lockfree/queue.hpp> @@ -45,5 +44,3 @@ private: }; }} // namespace uhd::rfnoc - -#endif /* INCLUDED_LIBUHD_TX_ASYNC_MSG_QUEUE_HPP */ diff --git a/host/lib/include/uhdlib/rfnoc/tx_flow_ctrl_state.hpp b/host/lib/include/uhdlib/rfnoc/tx_flow_ctrl_state.hpp index 0005e7584..af6cd28e1 100644 --- a/host/lib/include/uhdlib/rfnoc/tx_flow_ctrl_state.hpp +++ b/host/lib/include/uhdlib/rfnoc/tx_flow_ctrl_state.hpp @@ -4,8 +4,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_LIBUHD_RFNOC_TX_FLOW_CTRL_STATE_HPP -#define INCLUDED_LIBUHD_RFNOC_TX_FLOW_CTRL_STATE_HPP +#pragma once #include <uhdlib/rfnoc/rfnoc_common.hpp> @@ -92,5 +91,3 @@ private: }; }} // namespace uhd::rfnoc - -#endif /* INCLUDED_LIBUHD_RFNOC_TX_FLOW_CTRL_STATE_HPP */ diff --git a/host/lib/include/uhdlib/transport/adapter.hpp b/host/lib/include/uhdlib/transport/adapter.hpp index 3d6d49575..9ffc2ef6c 100644 --- a/host/lib/include/uhdlib/transport/adapter.hpp +++ b/host/lib/include/uhdlib/transport/adapter.hpp @@ -4,8 +4,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_UHDLIB_TRANSPORT_ADAPTER_HPP -#define INCLUDED_UHDLIB_TRANSPORT_ADAPTER_HPP +#pragma once #include <uhdlib/transport/adapter_info.hpp> #include <uhdlib/transport/udp_boost_asio_link.hpp> @@ -29,5 +28,3 @@ private: }; }} // namespace uhd::transport - -#endif /* INCLUDED_UHDLIB_TRANSPORT_ADAPTER_HPP */ diff --git a/host/lib/include/uhdlib/transport/adapter_info.hpp b/host/lib/include/uhdlib/transport/adapter_info.hpp index a21551e96..c6fd798ab 100644 --- a/host/lib/include/uhdlib/transport/adapter_info.hpp +++ b/host/lib/include/uhdlib/transport/adapter_info.hpp @@ -4,8 +4,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_UHDLIB_TRANSPORT_ADAPTER_INFO_HPP -#define INCLUDED_UHDLIB_TRANSPORT_ADAPTER_INFO_HPP +#pragma once #include <uhd/transport/adapter_id.hpp> #include <uhd/utils/noncopyable.hpp> @@ -26,5 +25,3 @@ public: }; }} // namespace uhd::transport - -#endif /* INCLUDED_UHDLIB_TRANSPORT_ADAPTER_INFO_HPP */ diff --git a/host/lib/include/uhdlib/transport/dpdk/arp.hpp b/host/lib/include/uhdlib/transport/dpdk/arp.hpp index e71119bb3..684c3c370 100644 --- a/host/lib/include/uhdlib/transport/dpdk/arp.hpp +++ b/host/lib/include/uhdlib/transport/dpdk/arp.hpp @@ -3,8 +3,7 @@ // // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef _INCLUDED_UHDLIB_TRANSPORT_DPDK_ARP_HPP_ -#define _INCLUDED_UHDLIB_TRANSPORT_DPDK_ARP_HPP_ +#pragma once #include <uhdlib/transport/dpdk/common.hpp> #include <uhdlib/transport/dpdk/service_queue.hpp> @@ -26,4 +25,3 @@ struct arp_entry }; }}} /* namespace uhd::transport::dpdk */ -#endif /* _INCLUDED_UHDLIB_TRANSPORT_DPDK_ARP_HPP_ */ diff --git a/host/lib/include/uhdlib/transport/dpdk/common.hpp b/host/lib/include/uhdlib/transport/dpdk/common.hpp index ac3526e49..280b7da64 100644 --- a/host/lib/include/uhdlib/transport/dpdk/common.hpp +++ b/host/lib/include/uhdlib/transport/dpdk/common.hpp @@ -4,8 +4,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef _INCLUDED_UHDLIB_TRANSPORT_DPDK_COMMON_HPP_ -#define _INCLUDED_UHDLIB_TRANSPORT_DPDK_COMMON_HPP_ +#pragma once #include <uhd/config.hpp> #include <uhd/transport/frame_buff.hpp> @@ -401,5 +400,3 @@ private: } // namespace dpdk }} // namespace uhd::transport - -#endif /* _INCLUDED_UHDLIB_TRANSPORT_DPDK_COMMON_HPP_ */ diff --git a/host/lib/include/uhdlib/transport/dpdk/service_queue.hpp b/host/lib/include/uhdlib/transport/dpdk/service_queue.hpp index c95786864..85b29fe0a 100644 --- a/host/lib/include/uhdlib/transport/dpdk/service_queue.hpp +++ b/host/lib/include/uhdlib/transport/dpdk/service_queue.hpp @@ -3,8 +3,7 @@ // // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef _INCLUDED_UHDLIB_TRANSPORT_DPDK_SERVICE_QUEUE_HPP_ -#define _INCLUDED_UHDLIB_TRANSPORT_DPDK_SERVICE_QUEUE_HPP_ +#pragma once #include <uhd/exception.hpp> #include <uhd/utils/log.hpp> @@ -261,5 +260,3 @@ private: }; }}} // namespace uhd::transport::dpdk - -#endif /*_INCLUDED_UHDLIB_TRANSPORT_DPDK_SERVICE_QUEUE_HPP_ */ diff --git a/host/lib/include/uhdlib/transport/dpdk/udp.hpp b/host/lib/include/uhdlib/transport/dpdk/udp.hpp index 65e561315..d74183bf5 100644 --- a/host/lib/include/uhdlib/transport/dpdk/udp.hpp +++ b/host/lib/include/uhdlib/transport/dpdk/udp.hpp @@ -3,8 +3,7 @@ // // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef _INCLUDED_UHDLIB_TRANSPORT_DPDK_UDP_HPP_ -#define _INCLUDED_UHDLIB_TRANSPORT_DPDK_UDP_HPP_ +#pragma once #include <uhdlib/transport/dpdk/common.hpp> #include <arpa/inet.h> @@ -112,4 +111,3 @@ inline std::string eth_addr_to_string(const struct ether_addr mac_addr) } }}} /* namespace uhd::transport::dpdk */ -#endif /* _INCLUDED_UHDLIB_TRANSPORT_DPDK_UDP_HPP_ */ diff --git a/host/lib/include/uhdlib/transport/dpdk_io_service.hpp b/host/lib/include/uhdlib/transport/dpdk_io_service.hpp index 8e1fb29d0..223bed249 100644 --- a/host/lib/include/uhdlib/transport/dpdk_io_service.hpp +++ b/host/lib/include/uhdlib/transport/dpdk_io_service.hpp @@ -3,8 +3,7 @@ // // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef _INCLUDED_UHDLIB_TRANSPORT_DPDK_IO_SERVICE_HPP_ -#define _INCLUDED_UHDLIB_TRANSPORT_DPDK_IO_SERVICE_HPP_ +#pragma once #include <uhdlib/transport/dpdk/common.hpp> #include <uhdlib/transport/dpdk/service_queue.hpp> @@ -242,5 +241,3 @@ private: }; }} // namespace uhd::transport - -#endif /* _INCLUDED_UHDLIB_TRANSPORT_DPDK_IO_SERVICE_HPP_ */ diff --git a/host/lib/include/uhdlib/transport/dpdk_io_service_client.hpp b/host/lib/include/uhdlib/transport/dpdk_io_service_client.hpp index 300ca00b5..e40a8bc98 100644 --- a/host/lib/include/uhdlib/transport/dpdk_io_service_client.hpp +++ b/host/lib/include/uhdlib/transport/dpdk_io_service_client.hpp @@ -3,8 +3,7 @@ // // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef _INCLUDED_UHDLIB_TRANSPORT_DPDK_IO_SERVICE_CLIENT_HPP_ -#define _INCLUDED_UHDLIB_TRANSPORT_DPDK_IO_SERVICE_CLIENT_HPP_ +#pragma once #include <uhdlib/transport/dpdk/common.hpp> #include <uhdlib/transport/dpdk/service_queue.hpp> @@ -288,5 +287,3 @@ private: }} // namespace uhd::transport - -#endif /* _INCLUDED_UHDLIB_TRANSPORT_DPDK_IO_SERVICE_CLIENT_HPP_ */ diff --git a/host/lib/include/uhdlib/transport/dpdk_simple.hpp b/host/lib/include/uhdlib/transport/dpdk_simple.hpp index 8420510ea..072edbf9f 100644 --- a/host/lib/include/uhdlib/transport/dpdk_simple.hpp +++ b/host/lib/include/uhdlib/transport/dpdk_simple.hpp @@ -4,8 +4,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_DPDK_SIMPLE_HPP -#define INCLUDED_DPDK_SIMPLE_HPP +#pragma once #include <uhd/transport/udp_simple.hpp> @@ -53,5 +52,3 @@ public: }; }} // namespace uhd::transport - -#endif /* INCLUDED_DPDK_SIMPLE_HPP */ diff --git a/host/lib/include/uhdlib/transport/frame_reservation_mgr.hpp b/host/lib/include/uhdlib/transport/frame_reservation_mgr.hpp index f0dd853a4..e7cfc5078 100644 --- a/host/lib/include/uhdlib/transport/frame_reservation_mgr.hpp +++ b/host/lib/include/uhdlib/transport/frame_reservation_mgr.hpp @@ -4,8 +4,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_UHDLIB_TRANSPORT_FRAME_RESERVATION_MGR_HPP -#define INCLUDED_UHDLIB_TRANSPORT_FRAME_RESERVATION_MGR_HPP +#pragma once #include <uhd/config.hpp> #include <uhd/exception.hpp> @@ -106,5 +105,3 @@ private: }; }} // namespace uhd::transport - -#endif /* INCLUDED_UHDLIB_TRANSPORT_FRAME_RESERVATION_MGR_HPP */ diff --git a/host/lib/include/uhdlib/transport/get_aligned_buffs.hpp b/host/lib/include/uhdlib/transport/get_aligned_buffs.hpp index d0f5682ca..1146c2a7b 100644 --- a/host/lib/include/uhdlib/transport/get_aligned_buffs.hpp +++ b/host/lib/include/uhdlib/transport/get_aligned_buffs.hpp @@ -4,8 +4,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_LIBUHD_GET_ALIGNED_BUFFS_HPP -#define INCLUDED_LIBUHD_GET_ALIGNED_BUFFS_HPP +#pragma once #include <uhd/exception.hpp> #include <uhd/utils/log.hpp> @@ -172,5 +171,3 @@ private: }; }} // namespace uhd::transport - -#endif /* INCLUDED_LIBUHD_GET_ALIGNED_BUFFS_HPP */ diff --git a/host/lib/include/uhdlib/transport/inline_io_service.hpp b/host/lib/include/uhdlib/transport/inline_io_service.hpp index b0153a951..a9616dd86 100644 --- a/host/lib/include/uhdlib/transport/inline_io_service.hpp +++ b/host/lib/include/uhdlib/transport/inline_io_service.hpp @@ -4,8 +4,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_UHDLIB_TRANSPORT_INLINE_IO_SERVICE_HPP -#define INCLUDED_UHDLIB_TRANSPORT_INLINE_IO_SERVICE_HPP +#pragma once #include <uhdlib/transport/io_service.hpp> #include <unordered_map> @@ -129,5 +128,3 @@ private: }; }} // namespace uhd::transport - -#endif /* INCLUDED_UHDLIB_TRANSPORT_INLINE_IO_SERVICE_HPP */ diff --git a/host/lib/include/uhdlib/transport/io_service.hpp b/host/lib/include/uhdlib/transport/io_service.hpp index 5bbb91d1f..62dfdfe0d 100644 --- a/host/lib/include/uhdlib/transport/io_service.hpp +++ b/host/lib/include/uhdlib/transport/io_service.hpp @@ -34,8 +34,7 @@ */ -#ifndef INCLUDED_UHDLIB_TRANSPORT_IO_SERVICE_HPP -#define INCLUDED_UHDLIB_TRANSPORT_IO_SERVICE_HPP +#pragma once #include <uhdlib/transport/link_if.hpp> #include <functional> @@ -363,5 +362,3 @@ public: }; }} // namespace uhd::transport - -#endif /* INCLUDED_UHDLIB_TRANSPORT_IO_SERVICE_HPP */ diff --git a/host/lib/include/uhdlib/transport/liberio_link.hpp b/host/lib/include/uhdlib/transport/liberio_link.hpp index 6cd550572..e81a39393 100644 --- a/host/lib/include/uhdlib/transport/liberio_link.hpp +++ b/host/lib/include/uhdlib/transport/liberio_link.hpp @@ -4,8 +4,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_UHDLIB_TRANSPORT_LIBERIO_LINK_HPP -#define INCLUDED_UHDLIB_TRANSPORT_LIBERIO_LINK_HPP +#pragma once #include <uhd/config.hpp> #include <uhd/transport/buffer_pool.hpp> @@ -177,5 +176,3 @@ private: }; }} // namespace uhd::transport - -#endif /* INCLUDED_UHDLIB_TRANSPORT_LIBERIO_LINK_HPP */ diff --git a/host/lib/include/uhdlib/transport/link_base.hpp b/host/lib/include/uhdlib/transport/link_base.hpp index a57b681ca..078b82fc6 100644 --- a/host/lib/include/uhdlib/transport/link_base.hpp +++ b/host/lib/include/uhdlib/transport/link_base.hpp @@ -4,8 +4,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_UHDLIB_TRANSPORT_LINK_BASE_HPP -#define INCLUDED_UHDLIB_TRANSPORT_LINK_BASE_HPP +#pragma once #include <uhdlib/transport/link_if.hpp> #include <cassert> @@ -229,5 +228,3 @@ private: }; }} // namespace uhd::transport - -#endif /* INCLUDED_UHDLIB_TRANSPORT_LINK_BASE_HPP */ diff --git a/host/lib/include/uhdlib/transport/link_if.hpp b/host/lib/include/uhdlib/transport/link_if.hpp index 55755948c..0c3844d0e 100644 --- a/host/lib/include/uhdlib/transport/link_if.hpp +++ b/host/lib/include/uhdlib/transport/link_if.hpp @@ -4,13 +4,12 @@ // SPDX-License-Identifier: GPL-3.0-or-later // +#pragma once + #include <uhd/transport/adapter_id.hpp> #include <uhd/transport/frame_buff.hpp> #include <memory> -#ifndef INCLUDED_UHDLIB_TRANSPORT_LINK_IF_HPP -# define INCLUDED_UHDLIB_TRANSPORT_LINK_IF_HPP - namespace uhd { namespace transport { /*! @@ -126,5 +125,3 @@ public: }; }} // namespace uhd::transport - -#endif /* INCLUDED_UHDLIB_TRANSPORT_LINK_IF_HPP */ diff --git a/host/lib/include/uhdlib/transport/links.hpp b/host/lib/include/uhdlib/transport/links.hpp index 6fe51dbbd..f9d08de11 100644 --- a/host/lib/include/uhdlib/transport/links.hpp +++ b/host/lib/include/uhdlib/transport/links.hpp @@ -4,8 +4,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_UHDLIB_TRANSPORT_LINKS_HPP -#define INCLUDED_UHDLIB_TRANSPORT_LINKS_HPP +#pragma once #include <uhdlib/transport/io_service.hpp> #include <uhdlib/transport/link_if.hpp> @@ -38,5 +37,3 @@ struct link_params_t }} // namespace uhd::transport - -#endif /* INCLUDED_UHDLIB_TRANSPORT_LINKS_HPP */ diff --git a/host/lib/include/uhdlib/transport/nirio_link.hpp b/host/lib/include/uhdlib/transport/nirio_link.hpp index 296fe37b9..cf1bb1d75 100644 --- a/host/lib/include/uhdlib/transport/nirio_link.hpp +++ b/host/lib/include/uhdlib/transport/nirio_link.hpp @@ -4,8 +4,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_UHD_TRANSPORT_NIRIO_LINK_HPP -#define INCLUDED_UHD_TRANSPORT_NIRIO_LINK_HPP +#pragma once #include <uhd/config.hpp> #include <uhd/transport/buffer_pool.hpp> @@ -224,5 +223,3 @@ private: }} // namespace uhd::transport - -#endif /* INCLUDED_UHD_TRANSPORT_NIRIO_LINK_HPP */ diff --git a/host/lib/include/uhdlib/transport/offload_io_service.hpp b/host/lib/include/uhdlib/transport/offload_io_service.hpp index 02231c502..9d653f7ad 100644 --- a/host/lib/include/uhdlib/transport/offload_io_service.hpp +++ b/host/lib/include/uhdlib/transport/offload_io_service.hpp @@ -4,8 +4,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_UHDLIB_TRANSPORT_OFFLOAD_IO_SERVICE_HPP -#define INCLUDED_UHDLIB_TRANSPORT_OFFLOAD_IO_SERVICE_HPP +#pragma once #include <uhdlib/transport/io_service.hpp> #include <vector> @@ -54,5 +53,3 @@ public: }; }} // namespace uhd::transport - -#endif /* INCLUDED_UHDLIB_TRANSPORT_OFFLOAD_IO_SERVICE_HPP */ diff --git a/host/lib/include/uhdlib/transport/offload_io_service_client.hpp b/host/lib/include/uhdlib/transport/offload_io_service_client.hpp index d0e6bb4bd..775a5bfaf 100644 --- a/host/lib/include/uhdlib/transport/offload_io_service_client.hpp +++ b/host/lib/include/uhdlib/transport/offload_io_service_client.hpp @@ -4,8 +4,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_UHDLIB_TRANSPORT_OFFLOAD_IO_SERVICE_CLIENT_HPP -#define INCLUDED_UHDLIB_TRANSPORT_OFFLOAD_IO_SERVICE_CLIENT_HPP +#pragma once #include <uhd/transport/frame_buff.hpp> #include <chrono> @@ -174,5 +173,3 @@ private: }; }} // namespace uhd::transport - -#endif /* INCLUDED_UHDLIB_TRANSPORT_OFFLOAD_IO_SERVICE_CLIENT_HPP */ diff --git a/host/lib/include/uhdlib/transport/rx_streamer_impl.hpp b/host/lib/include/uhdlib/transport/rx_streamer_impl.hpp index 491a5ab98..ce66d2ccb 100644 --- a/host/lib/include/uhdlib/transport/rx_streamer_impl.hpp +++ b/host/lib/include/uhdlib/transport/rx_streamer_impl.hpp @@ -4,8 +4,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_LIBUHD_RX_STREAMER_IMPL_HPP -#define INCLUDED_LIBUHD_RX_STREAMER_IMPL_HPP +#pragma once #include <uhd/config.hpp> #include <uhd/convert.hpp> @@ -385,5 +384,3 @@ private: }; }} // namespace uhd::transport - -#endif /* INCLUDED_LIBUHD_RX_STREAMER_IMPL_HPP */ diff --git a/host/lib/include/uhdlib/transport/rx_streamer_zero_copy.hpp b/host/lib/include/uhdlib/transport/rx_streamer_zero_copy.hpp index 86f13f28d..ca2eb3506 100644 --- a/host/lib/include/uhdlib/transport/rx_streamer_zero_copy.hpp +++ b/host/lib/include/uhdlib/transport/rx_streamer_zero_copy.hpp @@ -4,8 +4,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_LIBUHD_RX_STREAMER_ZERO_COPY_HPP -#define INCLUDED_LIBUHD_RX_STREAMER_ZERO_COPY_HPP +#pragma once #include <uhd/config.hpp> #include <uhd/exception.hpp> @@ -384,5 +383,3 @@ private: }; }} // namespace uhd::transport - -#endif /* INCLUDED_LIBUHD_RX_STREAMER_ZERO_COPY_HPP */ diff --git a/host/lib/include/uhdlib/transport/tx_streamer_impl.hpp b/host/lib/include/uhdlib/transport/tx_streamer_impl.hpp index c1cc3156f..ae6a1b867 100644 --- a/host/lib/include/uhdlib/transport/tx_streamer_impl.hpp +++ b/host/lib/include/uhdlib/transport/tx_streamer_impl.hpp @@ -4,8 +4,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_LIBUHD_TX_STREAMER_IMPL_HPP -#define INCLUDED_LIBUHD_TX_STREAMER_IMPL_HPP +#pragma once #include <uhd/config.hpp> #include <uhd/convert.hpp> @@ -455,5 +454,3 @@ private: }; }} // namespace uhd::transport - -#endif /* INCLUDED_LIBUHD_TRANSPORT_TX_STREAMER_IMPL_HPP */ diff --git a/host/lib/include/uhdlib/transport/tx_streamer_zero_copy.hpp b/host/lib/include/uhdlib/transport/tx_streamer_zero_copy.hpp index aa36c9d3b..5b1829397 100644 --- a/host/lib/include/uhdlib/transport/tx_streamer_zero_copy.hpp +++ b/host/lib/include/uhdlib/transport/tx_streamer_zero_copy.hpp @@ -4,8 +4,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_LIBUHD_TX_STREAMER_ZERO_COPY_HPP -#define INCLUDED_LIBUHD_TX_STREAMER_ZERO_COPY_HPP +#pragma once #include <uhd/config.hpp> #include <uhd/stream.hpp> @@ -152,5 +151,3 @@ private: }; }} // namespace uhd::transport - -#endif /* INCLUDED_LIBUHD_TX_STREAMER_ZERO_COPY_HPP */ diff --git a/host/lib/include/uhdlib/transport/udp_boost_asio_link.hpp b/host/lib/include/uhdlib/transport/udp_boost_asio_link.hpp index 6b350e997..a5ba976c7 100644 --- a/host/lib/include/uhdlib/transport/udp_boost_asio_link.hpp +++ b/host/lib/include/uhdlib/transport/udp_boost_asio_link.hpp @@ -4,8 +4,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_UHD_TRANSPORT_UDP_BOOST_ASIO_LINK_HPP -#define INCLUDED_UHD_TRANSPORT_UDP_BOOST_ASIO_LINK_HPP +#pragma once #include <uhd/config.hpp> #include <uhd/transport/buffer_pool.hpp> @@ -155,5 +154,3 @@ private: }} // namespace uhd::transport - -#endif /* INCLUDED_UHD_TRANSPORT_UDP_BOOST_ASIO_LINK_HPP */ diff --git a/host/lib/include/uhdlib/transport/udp_common.hpp b/host/lib/include/uhdlib/transport/udp_common.hpp index 6deb265d4..cb11ce173 100644 --- a/host/lib/include/uhdlib/transport/udp_common.hpp +++ b/host/lib/include/uhdlib/transport/udp_common.hpp @@ -6,8 +6,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_TRANSPORT_UDP_COMMON_HPP -#define INCLUDED_TRANSPORT_UDP_COMMON_HPP +#pragma once #include <uhd/config.hpp> #include <uhd/exception.hpp> @@ -285,5 +284,3 @@ inline link_params_t calculate_udp_link_params( }} // namespace uhd::transport - -#endif /* INCLUDED_TRANSPORT_UDP_COMMON_HPP */ diff --git a/host/lib/include/uhdlib/transport/udp_dpdk_link.hpp b/host/lib/include/uhdlib/transport/udp_dpdk_link.hpp index eaf3cf7c4..305d35319 100644 --- a/host/lib/include/uhdlib/transport/udp_dpdk_link.hpp +++ b/host/lib/include/uhdlib/transport/udp_dpdk_link.hpp @@ -4,8 +4,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_UHDLIB_TRANSPORT_UDP_DPDK_LINK_HPP -#define INCLUDED_UHDLIB_TRANSPORT_UDP_DPDK_LINK_HPP +#pragma once #include <uhd/config.hpp> #include <uhd/transport/buffer_pool.hpp> @@ -263,5 +262,3 @@ private: }; }} // namespace uhd::transport - -#endif /* INCLUDED_UHDLIB_TRANSPORT_UDP_DPDK_LINK_HPP */ diff --git a/host/lib/include/uhdlib/usrp/common/ad9361_ctrl.hpp b/host/lib/include/uhdlib/usrp/common/ad9361_ctrl.hpp index c059a3a09..6fa9d0e74 100644 --- a/host/lib/include/uhdlib/usrp/common/ad9361_ctrl.hpp +++ b/host/lib/include/uhdlib/usrp/common/ad9361_ctrl.hpp @@ -5,8 +5,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_AD9361_CTRL_HPP -#define INCLUDED_AD9361_CTRL_HPP +#pragma once #include <uhd/exception.hpp> #include <uhd/types/filters.hpp> @@ -162,5 +161,3 @@ public: }; }} // namespace uhd::usrp - -#endif /* INCLUDED_AD9361_CTRL_HPP */ diff --git a/host/lib/include/uhdlib/usrp/common/ad936x_manager.hpp b/host/lib/include/uhdlib/usrp/common/ad936x_manager.hpp index d65983c72..61b792a1b 100644 --- a/host/lib/include/uhdlib/usrp/common/ad936x_manager.hpp +++ b/host/lib/include/uhdlib/usrp/common/ad936x_manager.hpp @@ -5,8 +5,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_AD9361_MANAGER_HPP -#define INCLUDED_AD9361_MANAGER_HPP +#pragma once #include <uhd/property_tree.hpp> #include <uhd/types/direction.hpp> @@ -110,5 +109,3 @@ public: }; /* class ad936x_manager */ }} /* namespace uhd::usrp */ - -#endif /* INCLUDED_AD9361_MANAGER_HPP */ diff --git a/host/lib/include/uhdlib/usrp/common/adf4001_ctrl.hpp b/host/lib/include/uhdlib/usrp/common/adf4001_ctrl.hpp index 0c1b06458..a98238a25 100644 --- a/host/lib/include/uhdlib/usrp/common/adf4001_ctrl.hpp +++ b/host/lib/include/uhdlib/usrp/common/adf4001_ctrl.hpp @@ -10,8 +10,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_LIBUHD_USRP_COMMON_ADF4001_HPP -#define INCLUDED_LIBUHD_USRP_COMMON_ADF4001_HPP +#pragma once #include <uhd/types/serial.hpp> #include <uhdlib/usrp/cores/spi_core_3000.hpp> @@ -119,5 +118,3 @@ private: }; }} // namespace uhd::usrp - -#endif diff --git a/host/lib/include/uhdlib/usrp/common/adf435x.hpp b/host/lib/include/uhdlib/usrp/common/adf435x.hpp index e805f9754..de93bfd69 100644 --- a/host/lib/include/uhdlib/usrp/common/adf435x.hpp +++ b/host/lib/include/uhdlib/usrp/common/adf435x.hpp @@ -6,8 +6,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_ADF435X_HPP -#define INCLUDED_ADF435X_HPP +#pragma once #include "adf4350_regs.hpp" #include "adf4351_regs.hpp" @@ -615,5 +614,3 @@ inline int adf435x_impl<adf4351_regs_t>::_get_rfdiv_setting(uint16_t div) UHD_THROW_INVALID_CODE_PATH(); } } - -#endif // INCLUDED_ADF435X_HPP diff --git a/host/lib/include/uhdlib/usrp/common/adf535x.hpp b/host/lib/include/uhdlib/usrp/common/adf535x.hpp index 65e552844..e8f4a9309 100644 --- a/host/lib/include/uhdlib/usrp/common/adf535x.hpp +++ b/host/lib/include/uhdlib/usrp/common/adf535x.hpp @@ -5,8 +5,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_ADF535X_HPP -#define INCLUDED_ADF535X_HPP +#pragma once #include "adf5355_regs.hpp" #include "adf5356_regs.hpp" @@ -614,5 +613,3 @@ inline void adf535x_impl<adf5356_regs_t>::_commit() _write_fn(addr_vtr_t(ONE_REG, _regs.get_reg(0))); } } - -#endif // INCLUDED_ADF535X_HPP diff --git a/host/lib/include/uhdlib/usrp/common/apply_corrections.hpp b/host/lib/include/uhdlib/usrp/common/apply_corrections.hpp index fb9aaa8f1..66a103456 100644 --- a/host/lib/include/uhdlib/usrp/common/apply_corrections.hpp +++ b/host/lib/include/uhdlib/usrp/common/apply_corrections.hpp @@ -5,8 +5,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_LIBUHD_USRP_COMMON_APPLY_CORRECTIONS_HPP -#define INCLUDED_LIBUHD_USRP_COMMON_APPLY_CORRECTIONS_HPP +#pragma once #include <uhd/config.hpp> #include <uhd/property_tree.hpp> @@ -76,5 +75,3 @@ void apply_rx_fe_corrections(property_tree::sptr sub_tree, // starts at mboards/ }} // namespace uhd::usrp - -#endif /* INCLUDED_LIBUHD_USRP_COMMON_APPLY_CORRECTIONS_HPP */ diff --git a/host/lib/include/uhdlib/usrp/common/async_packet_handler.hpp b/host/lib/include/uhdlib/usrp/common/async_packet_handler.hpp index 957afe7c1..6b61b5674 100644 --- a/host/lib/include/uhdlib/usrp/common/async_packet_handler.hpp +++ b/host/lib/include/uhdlib/usrp/common/async_packet_handler.hpp @@ -5,8 +5,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_LIBUHD_USRP_COMMON_ASYNC_PACKET_HANDLER_HPP -#define INCLUDED_LIBUHD_USRP_COMMON_ASYNC_PACKET_HANDLER_HPP +#pragma once #include <uhd/config.hpp> #include <uhd/transport/vrt_if_packet.hpp> @@ -61,5 +60,3 @@ UHD_INLINE void standard_async_msg_prints(const async_metadata_t& metadata) }} // namespace uhd::usrp - -#endif /* INCLUDED_LIBUHD_USRP_COMMON_ASYNC_PACKET_HANDLER_HPP */ diff --git a/host/lib/include/uhdlib/usrp/common/dpdk_io_service_mgr.hpp b/host/lib/include/uhdlib/usrp/common/dpdk_io_service_mgr.hpp index 018f78f38..77ed648c3 100644 --- a/host/lib/include/uhdlib/usrp/common/dpdk_io_service_mgr.hpp +++ b/host/lib/include/uhdlib/usrp/common/dpdk_io_service_mgr.hpp @@ -4,8 +4,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_UHDLIB_TRANSPORT_DPDK_IO_SERVICE_MGR_HPP -#define INCLUDED_UHDLIB_TRANSPORT_DPDK_IO_SERVICE_MGR_HPP +#pragma once #include <uhdlib/transport/dpdk/common.hpp> #include <uhdlib/transport/dpdk_io_service.hpp> @@ -65,5 +64,3 @@ private: }; }} // namespace uhd::usrp - -#endif /* INCLUDED_UHDLIB_TRANSPORT_DPDK_IO_SERVICE_MGR_HPP */ diff --git a/host/lib/include/uhdlib/usrp/common/fx2_ctrl.hpp b/host/lib/include/uhdlib/usrp/common/fx2_ctrl.hpp index 23498c96e..39a7a6fa4 100644 --- a/host/lib/include/uhdlib/usrp/common/fx2_ctrl.hpp +++ b/host/lib/include/uhdlib/usrp/common/fx2_ctrl.hpp @@ -5,8 +5,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_LIBUHD_USRP_COMMON_FX2_CTRL_HPP -#define INCLUDED_LIBUHD_USRP_COMMON_FX2_CTRL_HPP +#pragma once #include <uhd/transport/usb_control.hpp> #include <uhd/types/serial.hpp> //i2c iface @@ -130,5 +129,3 @@ public: }; }} // namespace uhd::usrp - -#endif /* INCLUDED_LIBUHD_USRP_COMMON_FX2_CTRL_HPP */ diff --git a/host/lib/include/uhdlib/usrp/common/io_service_args.hpp b/host/lib/include/uhdlib/usrp/common/io_service_args.hpp index e294df8ee..779b3faae 100644 --- a/host/lib/include/uhdlib/usrp/common/io_service_args.hpp +++ b/host/lib/include/uhdlib/usrp/common/io_service_args.hpp @@ -4,8 +4,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_LIBUHD_IO_SERVICE_ARGS_HPP -#define INCLUDED_LIBUHD_IO_SERVICE_ARGS_HPP +#pragma once #include <uhd/types/device_addr.hpp> #include <map> @@ -99,5 +98,3 @@ device_addr_t merge_io_service_dev_args( const device_addr_t& dev_args, const device_addr_t& stream_args); }} // namespace uhd::usrp - -#endif /* INCLUDED_LIBUHD_IO_SERVICE_ARGS_HPP */ diff --git a/host/lib/include/uhdlib/usrp/common/io_service_mgr.hpp b/host/lib/include/uhdlib/usrp/common/io_service_mgr.hpp index 2707c564c..6b2662703 100644 --- a/host/lib/include/uhdlib/usrp/common/io_service_mgr.hpp +++ b/host/lib/include/uhdlib/usrp/common/io_service_mgr.hpp @@ -4,8 +4,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_LIBUHD_IO_SERVICE_MGR_HPP -#define INCLUDED_LIBUHD_IO_SERVICE_MGR_HPP +#pragma once #include <uhd/transport/adapter_id.hpp> #include <uhd/types/device_addr.hpp> @@ -102,5 +101,3 @@ public: }; }} // namespace uhd::usrp - -#endif /* INCLUDED_LIBUHD_IO_SERVICE_MGR_HPP */ diff --git a/host/lib/include/uhdlib/usrp/common/lmx2592.hpp b/host/lib/include/uhdlib/usrp/common/lmx2592.hpp index 74a4df437..ad24689d4 100644 --- a/host/lib/include/uhdlib/usrp/common/lmx2592.hpp +++ b/host/lib/include/uhdlib/usrp/common/lmx2592.hpp @@ -4,8 +4,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_LMX2592_HPP -#define INCLUDED_LMX2592_HPP +#pragma once #include "lmx2592_regs.hpp" #include <uhd/utils/log.hpp> @@ -53,5 +52,3 @@ public: virtual void commit() = 0; }; - -#endif // INCLUDED_LMX2592_HPP diff --git a/host/lib/include/uhdlib/usrp/common/mpmd_mb_controller.hpp b/host/lib/include/uhdlib/usrp/common/mpmd_mb_controller.hpp index 25d32ee28..7285eb254 100644 --- a/host/lib/include/uhdlib/usrp/common/mpmd_mb_controller.hpp +++ b/host/lib/include/uhdlib/usrp/common/mpmd_mb_controller.hpp @@ -4,8 +4,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_LIBUHD_MPMD_MB_CONTROLLER_HPP -#define INCLUDED_LIBUHD_MPMD_MB_CONTROLLER_HPP +#pragma once #include <uhd/rfnoc/mb_controller.hpp> #include <uhdlib/utils/rpc.hpp> @@ -108,5 +107,3 @@ private: }; }} // namespace uhd::rfnoc - -#endif /* INCLUDED_LIBUHD_MPMD_MB_CONTROLLER_HPP */ diff --git a/host/lib/include/uhdlib/usrp/common/recv_packet_demuxer.hpp b/host/lib/include/uhdlib/usrp/common/recv_packet_demuxer.hpp index 09882378e..79c093314 100644 --- a/host/lib/include/uhdlib/usrp/common/recv_packet_demuxer.hpp +++ b/host/lib/include/uhdlib/usrp/common/recv_packet_demuxer.hpp @@ -5,8 +5,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_LIBUHD_USRP_COMMON_RECV_PACKET_DEMUXER_HPP -#define INCLUDED_LIBUHD_USRP_COMMON_RECV_PACKET_DEMUXER_HPP +#pragma once #include <uhd/config.hpp> #include <uhd/transport/zero_copy.hpp> @@ -33,5 +32,3 @@ public: }; }} // namespace uhd::usrp - -#endif /* INCLUDED_LIBUHD_USRP_COMMON_RECV_PACKET_DEMUXER_HPP */ diff --git a/host/lib/include/uhdlib/usrp/common/recv_packet_demuxer_3000.hpp b/host/lib/include/uhdlib/usrp/common/recv_packet_demuxer_3000.hpp index 4d20e17cc..9cbede8e4 100644 --- a/host/lib/include/uhdlib/usrp/common/recv_packet_demuxer_3000.hpp +++ b/host/lib/include/uhdlib/usrp/common/recv_packet_demuxer_3000.hpp @@ -5,8 +5,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_LIBUHD_USRP_COMMON_RECV_PACKET_DEMUXER_3000_HPP -#define INCLUDED_LIBUHD_USRP_COMMON_RECV_PACKET_DEMUXER_3000_HPP +#pragma once #include <uhd/config.hpp> #include <uhd/transport/zero_copy.hpp> @@ -161,5 +160,3 @@ inline transport::zero_copy_if::sptr recv_packet_demuxer_3000::make_proxy( } }} // namespace uhd::usrp - -#endif /* INCLUDED_LIBUHD_USRP_COMMON_RECV_PACKET_DEMUXER_3000_HPP */ diff --git a/host/lib/include/uhdlib/usrp/common/validate_subdev_spec.hpp b/host/lib/include/uhdlib/usrp/common/validate_subdev_spec.hpp index eb56da12e..2ab996cfd 100644 --- a/host/lib/include/uhdlib/usrp/common/validate_subdev_spec.hpp +++ b/host/lib/include/uhdlib/usrp/common/validate_subdev_spec.hpp @@ -5,8 +5,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_LIBUHD_USRP_COMMON_VALIDATE_SUBDEV_SPEC_HPP -#define INCLUDED_LIBUHD_USRP_COMMON_VALIDATE_SUBDEV_SPEC_HPP +#pragma once #include <uhd/config.hpp> #include <uhd/property_tree.hpp> @@ -22,5 +21,3 @@ void validate_subdev_spec(property_tree::sptr tree, const std::string& mb = "0"); }} // namespace uhd::usrp - -#endif /* INCLUDED_LIBUHD_USRP_COMMON_VALIDATE_SUBDEV_SPEC_HPP */ diff --git a/host/lib/include/uhdlib/usrp/constrained_device_args.hpp b/host/lib/include/uhdlib/usrp/constrained_device_args.hpp index 6d836c84d..7588462c4 100644 --- a/host/lib/include/uhdlib/usrp/constrained_device_args.hpp +++ b/host/lib/include/uhdlib/usrp/constrained_device_args.hpp @@ -5,8 +5,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_LIBUHD_USRP_COMMON_CONSTRAINED_DEV_ARGS_HPP -#define INCLUDED_LIBUHD_USRP_COMMON_CONSTRAINED_DEV_ARGS_HPP +#pragma once #include <uhd/exception.hpp> #include <uhd/types/device_addr.hpp> @@ -327,5 +326,3 @@ protected: // Methods } }; }} // namespace uhd::usrp - -#endif /* INCLUDED_LIBUHD_USRP_COMMON_CONSTRAINED_DEV_ARGS_HPP */ diff --git a/host/lib/include/uhdlib/usrp/cores/dma_fifo_core_3000.hpp b/host/lib/include/uhdlib/usrp/cores/dma_fifo_core_3000.hpp index f69bafab9..810587fb2 100644 --- a/host/lib/include/uhdlib/usrp/cores/dma_fifo_core_3000.hpp +++ b/host/lib/include/uhdlib/usrp/cores/dma_fifo_core_3000.hpp @@ -6,8 +6,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_LIBUHD_USRP_DMA_FIFO_CORE_3000_HPP -#define INCLUDED_LIBUHD_USRP_DMA_FIFO_CORE_3000_HPP +#pragma once #include <uhd/config.hpp> #include <uhd/utils/noncopyable.hpp> @@ -53,5 +52,3 @@ public: //! Return the number of packats that have been transferred virtual uint32_t get_packet_count() = 0; }; - -#endif /* INCLUDED_LIBUHD_USRP_DMA_FIFO_CORE_3000_HPP */ diff --git a/host/lib/include/uhdlib/usrp/cores/dsp_core_utils.hpp b/host/lib/include/uhdlib/usrp/cores/dsp_core_utils.hpp index 5e1c90845..74b4c3848 100644 --- a/host/lib/include/uhdlib/usrp/cores/dsp_core_utils.hpp +++ b/host/lib/include/uhdlib/usrp/cores/dsp_core_utils.hpp @@ -5,8 +5,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_LIBUHD_DSP_CORE_UTILS_HPP -#define INCLUDED_LIBUHD_DSP_CORE_UTILS_HPP +#pragma once #include <tuple> @@ -23,5 +22,3 @@ void get_freq_and_freq_word(const double requested_freq, */ std::tuple<double, int> get_freq_and_freq_word( const double requested_freq, const double tick_rate); - -#endif /* INCLUDED_LIBUHD_DSP_CORE_UTILS_HPP */ diff --git a/host/lib/include/uhdlib/usrp/cores/gpio_atr_3000.hpp b/host/lib/include/uhdlib/usrp/cores/gpio_atr_3000.hpp index ad7d4b588..aa266cbcb 100644 --- a/host/lib/include/uhdlib/usrp/cores/gpio_atr_3000.hpp +++ b/host/lib/include/uhdlib/usrp/cores/gpio_atr_3000.hpp @@ -5,8 +5,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_LIBUHD_USRP_GPIO_CORE_3000_HPP -#define INCLUDED_LIBUHD_USRP_GPIO_CORE_3000_HPP +#pragma once #include <uhd/config.hpp> #include <uhd/types/wb_iface.hpp> @@ -200,5 +199,3 @@ public: }; }}} // namespace uhd::usrp::gpio_atr - -#endif /* INCLUDED_LIBUHD_USRP_GPIO_CORE_3000_HPP */ diff --git a/host/lib/include/uhdlib/usrp/cores/gpio_core_200.hpp b/host/lib/include/uhdlib/usrp/cores/gpio_core_200.hpp index 920dd1e3c..fdc9dc8da 100644 --- a/host/lib/include/uhdlib/usrp/cores/gpio_core_200.hpp +++ b/host/lib/include/uhdlib/usrp/cores/gpio_core_200.hpp @@ -5,8 +5,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_LIBUHD_USRP_GPIO_CORE_200_HPP -#define INCLUDED_LIBUHD_USRP_GPIO_CORE_200_HPP +#pragma once #include <uhd/config.hpp> #include <uhd/types/wb_iface.hpp> @@ -75,5 +74,3 @@ public: virtual void set_all_regs(const uint32_t value) = 0; }; - -#endif /* INCLUDED_LIBUHD_USRP_GPIO_CORE_200_HPP */ diff --git a/host/lib/include/uhdlib/usrp/cores/i2c_core_100_wb32.hpp b/host/lib/include/uhdlib/usrp/cores/i2c_core_100_wb32.hpp index 15afda0ef..e38f73127 100644 --- a/host/lib/include/uhdlib/usrp/cores/i2c_core_100_wb32.hpp +++ b/host/lib/include/uhdlib/usrp/cores/i2c_core_100_wb32.hpp @@ -5,8 +5,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_LIBUHD_USRP_I2C_CORE_100_WB32_HPP -#define INCLUDED_LIBUHD_USRP_I2C_CORE_100_WB32_HPP +#pragma once #include <uhd/config.hpp> #include <uhd/types/serial.hpp> @@ -26,5 +25,3 @@ public: virtual void set_clock_rate(const double rate) = 0; }; - -#endif /* INCLUDED_LIBUHD_USRP_I2C_CORE_100_WB32_HPP */ diff --git a/host/lib/include/uhdlib/usrp/cores/i2c_core_200.hpp b/host/lib/include/uhdlib/usrp/cores/i2c_core_200.hpp index 2f6c4da79..4b7353812 100644 --- a/host/lib/include/uhdlib/usrp/cores/i2c_core_200.hpp +++ b/host/lib/include/uhdlib/usrp/cores/i2c_core_200.hpp @@ -5,8 +5,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_LIBUHD_USRP_I2C_CORE_200_HPP -#define INCLUDED_LIBUHD_USRP_I2C_CORE_200_HPP +#pragma once #include <uhd/config.hpp> #include <uhd/types/serial.hpp> @@ -25,5 +24,3 @@ public: //! makes a new i2c core from iface and slave base static sptr make(uhd::wb_iface::sptr iface, const size_t base, const size_t readback); }; - -#endif /* INCLUDED_LIBUHD_USRP_I2C_CORE_200_HPP */ diff --git a/host/lib/include/uhdlib/usrp/cores/radio_ctrl_core_3000.hpp b/host/lib/include/uhdlib/usrp/cores/radio_ctrl_core_3000.hpp index c94217e82..0b5ba6a6f 100644 --- a/host/lib/include/uhdlib/usrp/cores/radio_ctrl_core_3000.hpp +++ b/host/lib/include/uhdlib/usrp/cores/radio_ctrl_core_3000.hpp @@ -5,8 +5,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_LIBUHD_USRP_RADIO_CTRL_3000_HPP -#define INCLUDED_LIBUHD_USRP_RADIO_CTRL_3000_HPP +#pragma once #include <uhd/transport/zero_copy.hpp> #include <uhd/types/time_spec.hpp> @@ -48,5 +47,3 @@ public: //! Set the tick rate (converting time into ticks) virtual void set_tick_rate(const double rate) = 0; }; - -#endif /* INCLUDED_LIBUHD_USRP_RADIO_CTRL_3000_HPP */ diff --git a/host/lib/include/uhdlib/usrp/cores/rx_dsp_core_200.hpp b/host/lib/include/uhdlib/usrp/cores/rx_dsp_core_200.hpp index 7f0cd9995..bbbb7d38a 100644 --- a/host/lib/include/uhdlib/usrp/cores/rx_dsp_core_200.hpp +++ b/host/lib/include/uhdlib/usrp/cores/rx_dsp_core_200.hpp @@ -5,8 +5,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_LIBUHD_USRP_RX_DSP_CORE_200_HPP -#define INCLUDED_LIBUHD_USRP_RX_DSP_CORE_200_HPP +#pragma once #include <uhd/config.hpp> #include <uhd/stream.hpp> @@ -56,5 +55,3 @@ public: virtual void setup(const uhd::stream_args_t& stream_args) = 0; }; - -#endif /* INCLUDED_LIBUHD_USRP_RX_DSP_CORE_200_HPP */ diff --git a/host/lib/include/uhdlib/usrp/cores/rx_dsp_core_3000.hpp b/host/lib/include/uhdlib/usrp/cores/rx_dsp_core_3000.hpp index f89d78191..0547ac4b1 100644 --- a/host/lib/include/uhdlib/usrp/cores/rx_dsp_core_3000.hpp +++ b/host/lib/include/uhdlib/usrp/cores/rx_dsp_core_3000.hpp @@ -5,8 +5,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_LIBUHD_USRP_RX_DSP_CORE_3000_HPP -#define INCLUDED_LIBUHD_USRP_RX_DSP_CORE_3000_HPP +#pragma once #include <uhd/config.hpp> #include <uhd/property_tree.hpp> @@ -58,5 +57,3 @@ public: virtual void populate_subtree(uhd::property_tree::sptr subtree) = 0; }; - -#endif /* INCLUDED_LIBUHD_USRP_RX_DSP_CORE_3000_HPP */ diff --git a/host/lib/include/uhdlib/usrp/cores/rx_frontend_core_200.hpp b/host/lib/include/uhdlib/usrp/cores/rx_frontend_core_200.hpp index 8c51dac6c..6b7d84e9d 100644 --- a/host/lib/include/uhdlib/usrp/cores/rx_frontend_core_200.hpp +++ b/host/lib/include/uhdlib/usrp/cores/rx_frontend_core_200.hpp @@ -5,8 +5,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_LIBUHD_USRP_TX_FRONTEND_CORE_200_HPP -#define INCLUDED_LIBUHD_USRP_TX_FRONTEND_CORE_200_HPP +#pragma once #include <uhd/config.hpp> #include <uhd/property_tree.hpp> @@ -39,5 +38,3 @@ public: virtual void populate_subtree(uhd::property_tree::sptr subtree) = 0; }; - -#endif /* INCLUDED_LIBUHD_USRP_TX_FRONTEND_CORE_200_HPP */ diff --git a/host/lib/include/uhdlib/usrp/cores/rx_frontend_core_3000.hpp b/host/lib/include/uhdlib/usrp/cores/rx_frontend_core_3000.hpp index d340d6f4d..6b5dafe2a 100644 --- a/host/lib/include/uhdlib/usrp/cores/rx_frontend_core_3000.hpp +++ b/host/lib/include/uhdlib/usrp/cores/rx_frontend_core_3000.hpp @@ -5,8 +5,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_LIBUHD_USRP_TX_FRONTEND_CORE_3000_HPP -#define INCLUDED_LIBUHD_USRP_TX_FRONTEND_CORE_3000_HPP +#pragma once #include <uhd/config.hpp> #include <uhd/property_tree.hpp> @@ -56,5 +55,3 @@ public: */ virtual double get_output_rate(void) = 0; }; - -#endif /* INCLUDED_LIBUHD_USRP_TX_FRONTEND_CORE_3000_HPP */ diff --git a/host/lib/include/uhdlib/usrp/cores/rx_vita_core_3000.hpp b/host/lib/include/uhdlib/usrp/cores/rx_vita_core_3000.hpp index 0f1850ddc..22e0d39ed 100644 --- a/host/lib/include/uhdlib/usrp/cores/rx_vita_core_3000.hpp +++ b/host/lib/include/uhdlib/usrp/cores/rx_vita_core_3000.hpp @@ -5,8 +5,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_LIBUHD_USRP_RX_VITA_CORE_3000_HPP -#define INCLUDED_LIBUHD_USRP_RX_VITA_CORE_3000_HPP +#pragma once #include <uhd/config.hpp> #include <uhd/stream.hpp> @@ -44,5 +43,3 @@ public: virtual bool in_continuous_streaming_mode(void) = 0; }; - -#endif /* INCLUDED_LIBUHD_USRP_RX_VITA_CORE_3000_HPP */ diff --git a/host/lib/include/uhdlib/usrp/cores/spi_core_3000.hpp b/host/lib/include/uhdlib/usrp/cores/spi_core_3000.hpp index 6dc0474ce..e0caaa2e7 100644 --- a/host/lib/include/uhdlib/usrp/cores/spi_core_3000.hpp +++ b/host/lib/include/uhdlib/usrp/cores/spi_core_3000.hpp @@ -5,8 +5,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_LIBUHD_USRP_SPI_CORE_3000_HPP -#define INCLUDED_LIBUHD_USRP_SPI_CORE_3000_HPP +#pragma once #include <uhd/config.hpp> #include <uhd/types/serial.hpp> @@ -44,5 +43,3 @@ public: //! Get state of shutdown register virtual bool get_shutdown() = 0; }; - -#endif /* INCLUDED_LIBUHD_USRP_SPI_CORE_3000_HPP */ diff --git a/host/lib/include/uhdlib/usrp/cores/time64_core_200.hpp b/host/lib/include/uhdlib/usrp/cores/time64_core_200.hpp index 27ef775f8..cf225ed9f 100644 --- a/host/lib/include/uhdlib/usrp/cores/time64_core_200.hpp +++ b/host/lib/include/uhdlib/usrp/cores/time64_core_200.hpp @@ -5,8 +5,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_LIBUHD_USRP_TIME64_CORE_200_HPP -#define INCLUDED_LIBUHD_USRP_TIME64_CORE_200_HPP +#pragma once #include <uhd/config.hpp> #include <uhd/types/time_spec.hpp> @@ -53,5 +52,3 @@ public: virtual std::vector<std::string> get_time_sources(void) = 0; }; - -#endif /* INCLUDED_LIBUHD_USRP_TIME64_CORE_200_HPP */ diff --git a/host/lib/include/uhdlib/usrp/cores/time_core_3000.hpp b/host/lib/include/uhdlib/usrp/cores/time_core_3000.hpp index 93575bfaa..ff9883e6e 100644 --- a/host/lib/include/uhdlib/usrp/cores/time_core_3000.hpp +++ b/host/lib/include/uhdlib/usrp/cores/time_core_3000.hpp @@ -5,8 +5,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_LIBUHD_USRP_TIME_CORE_3000_HPP -#define INCLUDED_LIBUHD_USRP_TIME_CORE_3000_HPP +#pragma once #include <uhd/config.hpp> #include <uhd/types/time_spec.hpp> @@ -46,5 +45,3 @@ public: virtual void set_time_next_pps(const uhd::time_spec_t& time) = 0; }; - -#endif /* INCLUDED_LIBUHD_USRP_TIME_CORE_3000_HPP */ diff --git a/host/lib/include/uhdlib/usrp/cores/tx_dsp_core_200.hpp b/host/lib/include/uhdlib/usrp/cores/tx_dsp_core_200.hpp index 55423bceb..4d9ec44c3 100644 --- a/host/lib/include/uhdlib/usrp/cores/tx_dsp_core_200.hpp +++ b/host/lib/include/uhdlib/usrp/cores/tx_dsp_core_200.hpp @@ -5,8 +5,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_LIBUHD_USRP_TX_DSP_CORE_200_HPP -#define INCLUDED_LIBUHD_USRP_TX_DSP_CORE_200_HPP +#pragma once #include <uhd/config.hpp> #include <uhd/stream.hpp> @@ -47,5 +46,3 @@ public: virtual void setup(const uhd::stream_args_t& stream_args) = 0; }; - -#endif /* INCLUDED_LIBUHD_USRP_TX_DSP_CORE_200_HPP */ diff --git a/host/lib/include/uhdlib/usrp/cores/tx_dsp_core_3000.hpp b/host/lib/include/uhdlib/usrp/cores/tx_dsp_core_3000.hpp index 5dbded392..a328965f8 100644 --- a/host/lib/include/uhdlib/usrp/cores/tx_dsp_core_3000.hpp +++ b/host/lib/include/uhdlib/usrp/cores/tx_dsp_core_3000.hpp @@ -5,8 +5,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_LIBUHD_USRP_TX_DSP_CORE_3000_HPP -#define INCLUDED_LIBUHD_USRP_TX_DSP_CORE_3000_HPP +#pragma once #include <uhd/config.hpp> #include <uhd/property_tree.hpp> @@ -49,5 +48,3 @@ public: virtual void populate_subtree(uhd::property_tree::sptr subtree) = 0; }; - -#endif /* INCLUDED_LIBUHD_USRP_TX_DSP_CORE_3000_HPP */ diff --git a/host/lib/include/uhdlib/usrp/cores/tx_frontend_core_200.hpp b/host/lib/include/uhdlib/usrp/cores/tx_frontend_core_200.hpp index 23a097085..04c89a580 100644 --- a/host/lib/include/uhdlib/usrp/cores/tx_frontend_core_200.hpp +++ b/host/lib/include/uhdlib/usrp/cores/tx_frontend_core_200.hpp @@ -5,8 +5,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_LIBUHD_USRP_RX_FRONTEND_CORE_200_HPP -#define INCLUDED_LIBUHD_USRP_RX_FRONTEND_CORE_200_HPP +#pragma once #include <uhd/config.hpp> #include <uhd/property_tree.hpp> @@ -37,5 +36,3 @@ public: virtual void populate_subtree(uhd::property_tree::sptr subtree) = 0; }; - -#endif /* INCLUDED_LIBUHD_USRP_RX_FRONTEND_CORE_200_HPP */ diff --git a/host/lib/include/uhdlib/usrp/cores/tx_vita_core_3000.hpp b/host/lib/include/uhdlib/usrp/cores/tx_vita_core_3000.hpp index 22b6865c1..29559d875 100644 --- a/host/lib/include/uhdlib/usrp/cores/tx_vita_core_3000.hpp +++ b/host/lib/include/uhdlib/usrp/cores/tx_vita_core_3000.hpp @@ -5,8 +5,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_LIBUHD_USRP_TX_VITA_CORE_3000_HPP -#define INCLUDED_LIBUHD_USRP_TX_VITA_CORE_3000_HPP +#pragma once #include <uhd/config.hpp> #include <uhd/stream.hpp> @@ -39,5 +38,3 @@ public: virtual void configure_flow_control( const size_t cycs_per_up, const size_t pkts_per_up) = 0; }; - -#endif /* INCLUDED_LIBUHD_USRP_TX_VITA_CORE_3000_HPP */ diff --git a/host/lib/include/uhdlib/usrp/cores/user_settings_core_200.hpp b/host/lib/include/uhdlib/usrp/cores/user_settings_core_200.hpp index 717b4a8b1..fe3071c2b 100644 --- a/host/lib/include/uhdlib/usrp/cores/user_settings_core_200.hpp +++ b/host/lib/include/uhdlib/usrp/cores/user_settings_core_200.hpp @@ -5,8 +5,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_LIBUHD_USRP_USER_SETTINGS_CORE_200_HPP -#define INCLUDED_LIBUHD_USRP_USER_SETTINGS_CORE_200_HPP +#pragma once #include <uhd/config.hpp> #include <uhd/types/wb_iface.hpp> @@ -26,5 +25,3 @@ public: virtual void set_reg(const user_reg_t& reg) = 0; }; - -#endif /* INCLUDED_LIBUHD_USRP_USER_SETTINGS_CORE_200_HPP */ diff --git a/host/lib/include/uhdlib/usrp/cores/user_settings_core_3000.hpp b/host/lib/include/uhdlib/usrp/cores/user_settings_core_3000.hpp index 002b04a3f..3f461ddb7 100644 --- a/host/lib/include/uhdlib/usrp/cores/user_settings_core_3000.hpp +++ b/host/lib/include/uhdlib/usrp/cores/user_settings_core_3000.hpp @@ -5,8 +5,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_LIBUHD_USRP_USER_SETTINGS_CORE_3000_HPP -#define INCLUDED_LIBUHD_USRP_USER_SETTINGS_CORE_3000_HPP +#pragma once #include <uhd/config.hpp> #include <uhd/types/wb_iface.hpp> @@ -22,5 +21,3 @@ public: const wb_addr_type sr_base_addr, const wb_addr_type rb_reg_addr); }; - -#endif /* INCLUDED_LIBUHD_USRP_USER_SETTINGS_CORE_3000_HPP */ diff --git a/host/lib/include/uhdlib/usrp/gpio_defs.hpp b/host/lib/include/uhdlib/usrp/gpio_defs.hpp index 09d74cfad..69de2e6df 100644 --- a/host/lib/include/uhdlib/usrp/gpio_defs.hpp +++ b/host/lib/include/uhdlib/usrp/gpio_defs.hpp @@ -4,8 +4,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_LIBUHD_USRP_GPIO_DEFS_LIB_HPP -#define INCLUDED_LIBUHD_USRP_GPIO_DEFS_LIB_HPP +#pragma once #include <uhd/usrp/gpio_defs.hpp> #include <map> @@ -98,5 +97,3 @@ static const std::map<std::string, std::map<std::string, uint32_t>> gpio_attr_va {GPIO_ATTR_READBACK, uhd::usrp::gpio_atr::gpio_level_map}}; }}} // namespace uhd::usrp::gpio_atr - -#endif /* INCLUDED_LIBUHD_USRP_GPIO_DEFS_LIB_HPP */ diff --git a/host/lib/include/uhdlib/utils/atomic.hpp b/host/lib/include/uhdlib/utils/atomic.hpp index 98b1cfa7b..33bc78fed 100644 --- a/host/lib/include/uhdlib/utils/atomic.hpp +++ b/host/lib/include/uhdlib/utils/atomic.hpp @@ -5,8 +5,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_UHD_UTILS_ATOMIC_HPP -#define INCLUDED_UHD_UTILS_ATOMIC_HPP +#pragma once #include <uhd/config.hpp> #include <uhd/types/time_spec.hpp> @@ -74,5 +73,3 @@ private: }; } // namespace uhd - -#endif /* INCLUDED_UHD_UTILS_ATOMIC_HPP */ diff --git a/host/lib/include/uhdlib/utils/auto_timer.hpp b/host/lib/include/uhdlib/utils/auto_timer.hpp index 5d1c88911..f57b95d36 100644 --- a/host/lib/include/uhdlib/utils/auto_timer.hpp +++ b/host/lib/include/uhdlib/utils/auto_timer.hpp @@ -10,8 +10,7 @@ // It should not be used in production code. // -#ifndef INCLUDED_UHD_UTILS_AUTO_TIMER_HPP -#define INCLUDED_UHD_UTILS_AUTO_TIMER_HPP +#pragma once // for now, only implemented for windows #ifdef UHD_PLATFORM_WIN32 @@ -131,5 +130,3 @@ private: # define PROFILE_TIMING_WITH_THRESHOLD_AND_SCALE(context, threshold, unitScale) #endif - -#endif /* INCLUDED_UHD_UTILS_AUTO_TIMER_HPP */ diff --git a/host/lib/include/uhdlib/utils/compat_check.hpp b/host/lib/include/uhdlib/utils/compat_check.hpp index 708c5ab16..852307fb2 100644 --- a/host/lib/include/uhdlib/utils/compat_check.hpp +++ b/host/lib/include/uhdlib/utils/compat_check.hpp @@ -4,8 +4,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_UHDLIB_UTILS_COMPATCHECK_HPP -#define INCLUDED_UHDLIB_UTILS_COMPATCHECK_HPP +#pragma once #include <cstddef> #include <string> @@ -35,5 +34,3 @@ void assert_fpga_compat(const size_t uhd_major, const bool fail_on_minor_behind = false); } /* namespace uhd */ - -#endif /* INCLUDED_UHDLIB_UTILS_COMPATCHECK_HPP */ diff --git a/host/lib/include/uhdlib/utils/config_parser.hpp b/host/lib/include/uhdlib/utils/config_parser.hpp index 13a6346e8..6d17b4154 100644 --- a/host/lib/include/uhdlib/utils/config_parser.hpp +++ b/host/lib/include/uhdlib/utils/config_parser.hpp @@ -4,8 +4,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_LIBUHD_CONFIG_PARSER_HPP -#define INCLUDED_LIBUHD_CONFIG_PARSER_HPP +#pragma once #include <uhd/exception.hpp> #include <boost/property_tree/ptree.hpp> @@ -107,5 +106,3 @@ private: }; } /* namespace uhd */ - -#endif /* INCLUDED_LIBUHD_CONFIG_PARSER_HPP */ diff --git a/host/lib/include/uhdlib/utils/ihex.hpp b/host/lib/include/uhdlib/utils/ihex.hpp index 58e4d5637..687b1276c 100644 --- a/host/lib/include/uhdlib/utils/ihex.hpp +++ b/host/lib/include/uhdlib/utils/ihex.hpp @@ -5,8 +5,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_IHEX_READER_HPP -#define INCLUDED_IHEX_READER_HPP +#pragma once #include <stdint.h> #include <functional> @@ -64,5 +63,3 @@ private: }; }; /* namespace uhd */ - -#endif /* INCLUDED_IHEX_READER_HPP */ diff --git a/host/lib/include/uhdlib/utils/interpolation.hpp b/host/lib/include/uhdlib/utils/interpolation.hpp index 10fc06559..6105dedc9 100644 --- a/host/lib/include/uhdlib/utils/interpolation.hpp +++ b/host/lib/include/uhdlib/utils/interpolation.hpp @@ -6,8 +6,7 @@ // Various interpolation functions used within UHD -#ifndef INCLUDED_UHD_UTILS_INTERP_HPP -#define INCLUDED_UHD_UTILS_INTERP_HPP +#pragma once #include <uhd/utils/math.hpp> #include <uhd/utils/interpolation.hpp> @@ -136,5 +135,3 @@ typename map_type::mapped_type at_lin_interp( } }} // namespace uhd::math - -#endif /* INCLUDED_UHD_UTILS_INTERP_HPP */ diff --git a/host/lib/include/uhdlib/utils/isatty.hpp b/host/lib/include/uhdlib/utils/isatty.hpp index 03ca23893..2942e2600 100644 --- a/host/lib/include/uhdlib/utils/isatty.hpp +++ b/host/lib/include/uhdlib/utils/isatty.hpp @@ -4,8 +4,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_UHDLIB_UTILS_ISATTY_HPP -#define INCLUDED_UHDLIB_UTILS_ISATTY_HPP +#pragma once #include <uhd/config.hpp> #include <uhdlib/utils/narrow.hpp> @@ -52,5 +51,3 @@ bool is_a_tty(const int fd) #endif } /* namespace uhd */ - -#endif /* INCLUDED_UHDLIB_UTILS_ISATTY_HPP */ diff --git a/host/lib/include/uhdlib/utils/math.hpp b/host/lib/include/uhdlib/utils/math.hpp index 924459ec9..9b11a3eab 100644 --- a/host/lib/include/uhdlib/utils/math.hpp +++ b/host/lib/include/uhdlib/utils/math.hpp @@ -6,8 +6,7 @@ // More math, but not meant for public API -#ifndef INCLUDED_UHDLIB_UTILS_MATH_HPP -#define INCLUDED_UHDLIB_UTILS_MATH_HPP +#pragma once #include <uhdlib/utils/narrow.hpp> #include <cmath> @@ -97,5 +96,3 @@ std::pair<IntegerType, IntegerType> rational_approximation( }} /* namespace uhd::math */ - -#endif /* INCLUDED_UHDLIB_UTILS_MATH_HPP */ diff --git a/host/lib/include/uhdlib/utils/narrow.hpp b/host/lib/include/uhdlib/utils/narrow.hpp index daedd55db..396170e5b 100644 --- a/host/lib/include/uhdlib/utils/narrow.hpp +++ b/host/lib/include/uhdlib/utils/narrow.hpp @@ -41,8 +41,7 @@ // [End of GSL license] /////////////////////////////////////////////////////////////////////////////// -#ifndef INCLUDED_UHDLIB_UTILS_NARROW_HPP -#define INCLUDED_UHDLIB_UTILS_NARROW_HPP +#pragma once #include <uhd/exception.hpp> #include <utility> @@ -96,5 +95,3 @@ inline T narrow(U u) #if defined(_MSC_VER) # pragma warning(pop) #endif // _MSC_VER - -#endif /* INCLUDED_UHDLIB_UTILS_NARROW_HPP */ diff --git a/host/lib/include/uhdlib/utils/paths.hpp b/host/lib/include/uhdlib/utils/paths.hpp index cff9299d6..9475e6174 100644 --- a/host/lib/include/uhdlib/utils/paths.hpp +++ b/host/lib/include/uhdlib/utils/paths.hpp @@ -4,8 +4,7 @@ // SPDX-License-Identifier: GPL-3.0+ // -#ifndef INCLUDED_UHDLIB_UTILS_PATHS_HPP -#define INCLUDED_UHDLIB_UTILS_PATHS_HPP +#pragma once #include <boost/filesystem.hpp> #include <string> @@ -43,5 +42,3 @@ boost::filesystem::path get_xdg_config_home(); boost::filesystem::path get_legacy_config_home(); } /* namespace uhd */ - -#endif /* INCLUDED_UHDLIB_UTILS_PATHS_HPP */ diff --git a/host/lib/include/uhdlib/utils/prefs.hpp b/host/lib/include/uhdlib/utils/prefs.hpp index 6d75ac7ea..0395842a1 100644 --- a/host/lib/include/uhdlib/utils/prefs.hpp +++ b/host/lib/include/uhdlib/utils/prefs.hpp @@ -4,8 +4,7 @@ // SPDX-License-Identifier: GPL-3.0+ // -#ifndef INCLUDED_LIBUHD_UTILS_PREFS_HPP -#define INCLUDED_LIBUHD_UTILS_PREFS_HPP +#pragma once #include <uhd/types/device_addr.hpp> #include <uhdlib/utils/config_parser.hpp> @@ -83,5 +82,3 @@ uhd::device_addr_t get_dpdk_args(const uhd::device_addr_t& user_args); */ uhd::device_addr_t get_dpdk_nic_args(const uhd::device_addr_t& user_args); }} /* namespace uhd::prefs */ - -#endif /* INCLUDED_LIBUHD_UTILS_PREFS_HPP */ diff --git a/host/lib/include/uhdlib/utils/rpc.hpp b/host/lib/include/uhdlib/utils/rpc.hpp index 6a45ba61f..e87a2ee32 100644 --- a/host/lib/include/uhdlib/utils/rpc.hpp +++ b/host/lib/include/uhdlib/utils/rpc.hpp @@ -5,8 +5,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#ifndef INCLUDED_UTILS_RPC_HPP -#define INCLUDED_UTILS_RPC_HPP +#pragma once #include <uhd/exception.hpp> #include <uhd/utils/log.hpp> @@ -326,5 +325,3 @@ private: }; } /* namespace uhd */ - -#endif /* INCLUDED_UTILS_RPC_HPP */ diff --git a/host/lib/include/uhdlib/utils/semaphore.hpp b/host/lib/include/uhdlib/utils/semaphore.hpp index fc869d64a..c497dcc23 100644 --- a/host/lib/include/uhdlib/utils/semaphore.hpp +++ b/host/lib/include/uhdlib/utils/semaphore.hpp @@ -4,13 +4,12 @@ // SPDX-License-Identifier: GPL-3.0-or-later // +#pragma once + #include <condition_variable> #include <chrono> #include <mutex> -#ifndef INCLUDED_UHDLIB_UTILS_SEMAPHORE_HPP -# define INCLUDED_UHDLIB_UTILS_SEMAPHORE_HPP - namespace uhd { /*! @@ -67,5 +66,3 @@ private: }; } // namespace uhd - -#endif /* INCLUDED_UHDLIB_UTILS_SEMAPHORE_HPP */ |