util, io, net, ...: use "#pragma once"

src/io/BufferedOutputStream.hxx

@@ -1,8 +1,7 @@
 // SPDX-License-Identifier: BSD-2-Clause
 // author: Max Kellermann <max.kellermann@gmail.com>
 
-#ifndef BUFFERED_OUTPUT_STREAM_HXX
+#pragma once
-#define BUFFERED_OUTPUT_STREAM_HXX
 
 #include "util/DynamicFifoBuffer.hxx"
 #include "util/SpanCast.hxx"
@@ -130,5 +129,3 @@ WithBufferedOutputStream(OutputStream &os, F &&f)
 	f(bos);
 	bos.Flush();
 }
-
-#endif

src/io/Open.hxx

@@ -1,8 +1,7 @@
 // SPDX-License-Identifier: BSD-2-Clause
 // author: Max Kellermann <max.kellermann@gmail.com>
 
-#ifndef OPEN_HXX
+#pragma once
-#define OPEN_HXX
 
 class FileDescriptor;
 class UniqueFileDescriptor;
@@ -38,5 +37,3 @@ UniqueFileDescriptor
 OpenDirectory(FileDescriptor directory, const char *name, int flags=0);
 
 #endif
-
-#endif

src/io/OutputStream.hxx

@@ -1,8 +1,7 @@
 // SPDX-License-Identifier: BSD-2-Clause
 // author: Max Kellermann <max.kellermann@gmail.com>
 
-#ifndef OUTPUT_STREAM_HXX
+#pragma once
-#define OUTPUT_STREAM_HXX
 
 #include <cstddef>
 #include <span>
@@ -17,5 +16,3 @@ public:
 	 */
 	virtual void Write(std::span<const std::byte> src) = 0;
 };
-
-#endif

src/io/Reader.hxx

@@ -1,8 +1,7 @@
 // SPDX-License-Identifier: BSD-2-Clause
 // author: Max Kellermann <max.kellermann@gmail.com>
 
-#ifndef READER_HXX
+#pragma once
-#define READER_HXX
 
 #include <cstddef>
 #include <span>
@@ -41,5 +40,3 @@ public:
 		ReadFull(std::as_writable_bytes(std::span{&dest, 1}));
 	}
 };
-
-#endif

src/io/StdioOutputStream.hxx

@@ -1,8 +1,7 @@
 // SPDX-License-Identifier: BSD-2-Clause
 // author: Max Kellermann <max.kellermann@gmail.com>
 
-#ifndef STDIO_OUTPUT_STREAM_HXX
+#pragma once
-#define STDIO_OUTPUT_STREAM_HXX
 
 #include "OutputStream.hxx"
 
@@ -21,5 +20,3 @@ public:
 		/* this class is debug-only and ignores errors */
 	}
 };
-
-#endif

src/io/UniqueFileDescriptor.hxx

@@ -1,8 +1,7 @@
 // SPDX-License-Identifier: BSD-2-Clause
 // author: Max Kellermann <max.kellermann@gmail.com>
 
-#ifndef UNIQUE_FILE_DESCRIPTOR_HXX
+#pragma once
-#define UNIQUE_FILE_DESCRIPTOR_HXX
 
 #include "FileDescriptor.hxx" // IWYU pragma: export
 
@@ -72,5 +71,3 @@ public:
 		return IsDefined() && FileDescriptor::Close();
 	}
 };
-
-#endif

src/lib/curl/Global.hxx

@@ -1,8 +1,7 @@
 // SPDX-License-Identifier: BSD-2-Clause
 // author: Max Kellermann <max.kellermann@gmail.com>
 
-#ifndef CURL_GLOBAL_HXX
+#pragma once
-#define CURL_GLOBAL_HXX
 
 #include "Multi.hxx"
 #include "event/CoarseTimerEvent.hxx"
@@ -56,5 +55,3 @@ private:
 	/* callback for #timeout_event */
 	void OnTimeout() noexcept;
 };
-
-#endif

src/lib/curl/Slist.hxx

@@ -1,8 +1,7 @@
 // SPDX-License-Identifier: BSD-2-Clause
 // author: Max Kellermann <max.kellermann@gmail.com>
 
-#ifndef CURL_SLIST_HXX
+#pragma once
-#define CURL_SLIST_HXX
 
 #include <curl/curl.h>
 
@@ -47,5 +46,3 @@ public:
 		head = new_head;
 	}
 };
-
-#endif

src/lib/curl/String.hxx

@@ -1,8 +1,7 @@
 // SPDX-License-Identifier: BSD-2-Clause
 // author: Max Kellermann <max.kellermann@gmail.com>
 
-#ifndef CURL_STRING_HXX
+#pragma once
-#define CURL_STRING_HXX
 
 #include <curl/curl.h>
 
@@ -47,5 +46,3 @@ public:
 		return p;
 	}
 };
-
-#endif

src/lib/dbus/Connection.hxx

@@ -2,8 +2,7 @@
 // Copyright CM4all GmbH
 // author: Max Kellermann <mk@cm4all.com>
 
-#ifndef ODBUS_CONNECTION_HXX
+#pragma once
-#define ODBUS_CONNECTION_HXX
 
 #include <dbus/dbus.h>
 
@@ -61,5 +60,3 @@ public:
 };
 
 } /* namespace ODBus */
-
-#endif

src/lib/dbus/Iter.hxx

@@ -2,8 +2,7 @@
 // Copyright CM4all GmbH
 // author: Max Kellermann <mk@cm4all.com>
 
-#ifndef ODBUS_ITER_HXX
+#pragma once
-#define ODBUS_ITER_HXX
 
 #include <dbus/dbus.h>
 
@@ -21,5 +20,3 @@ public:
 };
 
 } /* namespace ODBus */
-
-#endif

src/lib/dbus/Message.hxx

@@ -2,8 +2,7 @@
 // Copyright CM4all GmbH
 // author: Max Kellermann <mk@cm4all.com>
 
-#ifndef ODBUS_MESSAGE_HXX
+#pragma once
-#define ODBUS_MESSAGE_HXX
 
 #include <dbus/dbus.h>
 
@@ -123,5 +122,3 @@ public:
 };
 
 } /* namespace ODBus */
-
-#endif

src/lib/dbus/PendingCall.hxx

@@ -2,8 +2,7 @@
 // Copyright CM4all GmbH
 // author: Max Kellermann <mk@cm4all.com>
 
-#ifndef ODBUS_PENDING_CALL_HXX
+#pragma once
-#define ODBUS_PENDING_CALL_HXX
 
 #include <dbus/dbus.h>
 
@@ -76,5 +75,3 @@ public:
 };
 
 } /* namespace ODBus */
-
-#endif

src/lib/dbus/ScopeMatch.hxx

@@ -2,8 +2,7 @@
 // Copyright CM4all GmbH
 // author: Max Kellermann <mk@cm4all.com>
 
-#ifndef ODBUS_SCOPE_MATCH_HXX
+#pragma once
-#define ODBUS_SCOPE_MATCH_HXX
 
 #include <dbus/dbus.h>
 
@@ -29,5 +28,3 @@ public:
 };
 
 } /* namespace ODBus */
-
-#endif

src/lib/dbus/Types.hxx

@@ -2,8 +2,7 @@
 // Copyright CM4all GmbH
 // author: Max Kellermann <mk@cm4all.com>
 
-#ifndef ODBUS_TYPES_HXX
+#pragma once
-#define ODBUS_TYPES_HXX
 
 #include "util/TemplateString.hxx"
 
@@ -89,5 +88,3 @@ struct StructTypeTraits {
 };
 
 } /* namespace ODBus */
-
-#endif

src/lib/zlib/Error.hxx

@@ -1,8 +1,7 @@
 // SPDX-License-Identifier: BSD-2-Clause
 // author: Max Kellermann <max.kellermann@gmail.com>
 
-#ifndef ZLIB_ERROR_HXX
+#pragma once
-#define ZLIB_ERROR_HXX
 
 #include <exception>
 
@@ -18,5 +17,3 @@ public:
 
 	const char *what() const noexcept override;
 };
-
-#endif

src/lib/zlib/GunzipReader.hxx

@@ -1,8 +1,7 @@
 // SPDX-License-Identifier: BSD-2-Clause
 // author: Max Kellermann <max.kellermann@gmail.com>
 
-#ifndef GUNZIP_READER_HXX
+#pragma once
-#define GUNZIP_READER_HXX
 
 #include "io/Reader.hxx"
 #include "util/StaticFifoBuffer.hxx"
@@ -39,5 +38,3 @@ public:
 private:
 	bool FillBuffer();
 };
-
-#endif

src/net/IPv4Address.hxx

@@ -1,8 +1,7 @@
 // SPDX-License-Identifier: BSD-2-Clause
 // author: Max Kellermann <max.kellermann@gmail.com>
 
-#ifndef IPV4_ADDRESS_HXX
+#pragma once
-#define IPV4_ADDRESS_HXX
 
 #include "SocketAddress.hxx"
 #include "util/ByteOrder.hxx"
@@ -209,5 +208,3 @@ public:
 				   GetPort() & other.GetPort());
 	}
 };
-
-#endif

src/net/IPv6Address.hxx

@@ -1,8 +1,7 @@
 // SPDX-License-Identifier: BSD-2-Clause
 // author: Max Kellermann <max.kellermann@gmail.com>
 
-#ifndef IPV6_ADDRESS_HXX
+#pragma once
-#define IPV6_ADDRESS_HXX
 
 #include "SocketAddress.hxx"
 #include "util/ByteOrder.hxx"
@@ -191,5 +190,3 @@ private:
 			   : (0xffff << (offset + 16 - prefix_length)));
 	}
 };
-
-#endif

src/net/Resolver.hxx

@@ -2,8 +2,7 @@
 // Copyright CM4all GmbH
 // author: Max Kellermann <mk@cm4all.com>
 
-#ifndef NET_RESOLVER_HXX
+#pragma once
-#define NET_RESOLVER_HXX
 
 class AddressInfoList;
 
@@ -30,5 +29,3 @@ Resolve(const char *host_and_port, int default_port,
 
 AddressInfoList
 Resolve(const char *host_port, unsigned default_port, int flags, int socktype);
-
-#endif

src/util/AllocatedString.hxx

@@ -1,8 +1,7 @@
 // SPDX-License-Identifier: BSD-2-Clause
 // author: Max Kellermann <max.kellermann@gmail.com>
 
-#ifndef ALLOCATED_STRING_HXX
+#pragma once
-#define ALLOCATED_STRING_HXX
 
 #include "StringPointer.hxx"
 
@@ -164,5 +163,3 @@ public:
 
 	using BasicAllocatedString::operator=;
 };
-
-#endif

src/util/Cast.hxx

@@ -1,8 +1,7 @@
 // SPDX-License-Identifier: BSD-2-Clause
 // author: Max Kellermann <max.kellermann@gmail.com>
 
-#ifndef CAST_HXX
+#pragma once
-#define CAST_HXX
 
 #include "OffsetPointer.hxx"
 
@@ -55,5 +54,3 @@ ContainerCast(const A &a, const A C::*member)
 {
 	return *OffsetCast<const C, const A>(&a, -ContainerAttributeOffset<C, A>(member));
 }
-
-#endif

src/util/CharUtil.hxx

@@ -1,8 +1,7 @@
 // SPDX-License-Identifier: BSD-2-Clause
 // author: Max Kellermann <max.kellermann@gmail.com>
 
-#ifndef CHAR_UTIL_HXX
+#pragma once
-#define CHAR_UTIL_HXX
 
 #ifdef _UNICODE
 #include "WCharUtil.hxx"
@@ -140,5 +139,3 @@ IsHexDigit(char ch) noexcept
 		(ch >= 'a' && ch <= 'f') ||
 		(ch >= 'A' && ch <= 'F');
 }
-
-#endif

src/util/DeleteDisposer.hxx

@@ -1,8 +1,7 @@
 // SPDX-License-Identifier: BSD-2-Clause
 // author: Max Kellermann <max.kellermann@gmail.com>
 
-#ifndef DELETE_DISPOSER_HXX
+#pragma once
-#define DELETE_DISPOSER_HXX
 
 /**
  * A disposer for boost::intrusive that invokes the "delete" operator
@@ -15,5 +14,3 @@ public:
 		delete t;
 	}
 };
-
-#endif

src/util/DynamicFifoBuffer.hxx

@@ -1,8 +1,7 @@
 // SPDX-License-Identifier: BSD-2-Clause
 // author: Max Kellermann <max.kellermann@gmail.com>
 
-#ifndef DYNAMIC_FIFO_BUFFER_HXX
+#pragma once
-#define DYNAMIC_FIFO_BUFFER_HXX
 
 #include "ForeignFifoBuffer.hxx"
 
@@ -91,5 +90,3 @@ public:
 protected:
 	using ForeignFifoBuffer<T>::GetBuffer;
 };
-
-#endif

src/util/Exception.hxx

@@ -1,8 +1,7 @@
 // SPDX-License-Identifier: BSD-2-Clause
 // author: Max Kellermann <max.kellermann@gmail.com>
 
-#ifndef EXCEPTION_HXX
+#pragma once
-#define EXCEPTION_HXX
 
 #include <exception>
 #include <string>
@@ -113,5 +112,3 @@ std::string
 GetFullMessage(std::exception_ptr ep,
 	       const char *fallback="Unknown exception",
 	       const char *separator="; ") noexcept;
-
-#endif

src/util/PrintException.hxx

@@ -2,8 +2,7 @@
 // Copyright CM4all GmbH
 // author: Max Kellermann <mk@cm4all.com>
 
-#ifndef PRINT_EXCEPTION_HXX
+#pragma once
-#define PRINT_EXCEPTION_HXX
 
 #include <exception>
 
@@ -15,5 +14,3 @@ PrintException(const std::exception &e) noexcept;
 
 void
 PrintException(const std::exception_ptr &ep) noexcept;
-
-#endif

src/util/ScopeExit.hxx

@@ -1,8 +1,7 @@
 // SPDX-License-Identifier: BSD-2-Clause
 // author: Max Kellermann <max.kellermann@gmail.com>
 
-#ifndef SCOPE_EXIT_HXX
+#pragma once
-#define SCOPE_EXIT_HXX
 
 #include <utility>
 
@@ -64,5 +63,3 @@ struct ScopeExitTag {
  * Boost's compile-time and runtime bloat.
  */
 #define AtScopeExit(...) auto ScopeExitName(__LINE__) = ScopeExitTag() + [__VA_ARGS__]()
-
-#endif

src/util/ShallowCopy.hxx

@@ -2,8 +2,7 @@
 // Copyright CM4all GmbH
 // author: Max Kellermann <mk@cm4all.com>
 
-#ifndef SHALLOW_COPY_HXX
+#pragma once
-#define SHALLOW_COPY_HXX
 
 /**
  * A tag for overloading copying constructors, telling them to make
@@ -11,5 +10,3 @@
  * duplicating the referenced objects).
  */
 struct ShallowCopy {};
-
-#endif

src/util/StringAPI.hxx

@@ -1,8 +1,7 @@
 // SPDX-License-Identifier: BSD-2-Clause
 // author: Max Kellermann <max.kellermann@gmail.com>
 
-#ifndef STRING_API_HXX
+#pragma once
-#define STRING_API_HXX
 
 #include <cstring>
 
@@ -193,5 +192,3 @@ DuplicateString(const char *p) noexcept
 {
 	return strdup(p);
 }
-
-#endif

src/util/StringBuffer.hxx

@@ -1,8 +1,7 @@
 // SPDX-License-Identifier: BSD-2-Clause
 // author: Max Kellermann <max.kellermann@gmail.com>
 
-#ifndef STRING_BUFFER_HXX
+#pragma once
-#define STRING_BUFFER_HXX
 
 #include <array>
 
@@ -89,5 +88,3 @@ public:
 
 template<std::size_t CAPACITY>
 class StringBuffer : public BasicStringBuffer<char, CAPACITY> {};
-
-#endif

src/util/StringPointer.hxx

@@ -1,8 +1,7 @@
 // SPDX-License-Identifier: BSD-2-Clause
 // author: Max Kellermann <max.kellermann@gmail.com>
 
-#ifndef STRING_POINTER_HXX
+#pragma once
-#define STRING_POINTER_HXX
 
 #include <cstddef>
 
@@ -52,5 +51,3 @@ public:
 		return *value == SENTINEL;
 	}
 };
-
-#endif