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/include | |
| 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/include')
157 files changed, 157 insertions, 626 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 */ |