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/lib | |
| 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/lib')
113 files changed, 115 insertions, 451 deletions
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 */ |