build: avoid double underscore header guards

alloc/fwd.hpp

@@ -6,9 +6,7 @@
  * Copyright 2016 Danny Robson <danny@nerdcruft.net>
  */
 
-#ifndef __UTIL_ALLOC_FWD_HPP
+#pragma once
-#define __UTIL_ALLOC_FWD_HPP
-
 
 namespace cruft::alloc {
     namespace raw {
@@ -31,5 +29,3 @@ namespace cruft::alloc {
     template <typename T> class arena;
     template <typename B, typename T> class allocator;
 }
-
-#endif

bezier.hpp

@@ -6,8 +6,7 @@
  * Copyright 2015-2016 Danny Robson <danny@nerdcruft.net>
  */
 
-#ifndef __UTIL_BEZIER_HPP
+#pragma once
-#define __UTIL_BEZIER_HPP
 
 #include "point.hpp"
 #include "region.hpp"
@@ -72,6 +71,4 @@ namespace cruft {
 
     template <size_t N>
     std::ostream& operator<< (std::ostream&, const bezier<N>&);
-}
+}
-
-#endif

colour.hpp

@@ -6,8 +6,7 @@
  * Copyright 2010-2017 Danny Robson <danny@nerdcruft.net>
  */
 
-#ifndef __UTIL_COLOUR_HPP
+#pragma once
-#define __UTIL_COLOUR_HPP
 
 #include "coord.hpp"
 
@@ -121,5 +120,3 @@ namespace cruft {
     template <typename T>
     constexpr auto is_colour_v = is_colour<T>::value;
 }
-
-#endif

coord.hpp

@@ -6,10 +6,7 @@
  * Copyright 2012-2015 Danny Robson <danny@nerdcruft.net>
  */
 
-#ifndef __UTIL_COORD_HPP
+#pragma once
-#define __UTIL_COORD_HPP
 
 #include "coord/base.hpp"
-#include "coord/ops.hpp"
+#include "coord/ops.hpp"
-
-#endif

exe.hpp

@@ -6,14 +6,11 @@
  * Copyright 2010-2012 Danny Robson <danny@nerdcruft.net>
  */
 
-#ifndef __UTIL_EXE_HPP
+#pragma once
-#define __UTIL_EXE_HPP
 
 #include <filesystem>
 
 namespace cruft {
     /// Returns a path to the current executable.
     std::filesystem::path image_path (void);
-}
+}
-
-#endif

float.hpp

@@ -6,8 +6,7 @@
  * Copyright 2011-2016 Danny Robson <danny@nerdcruft.net>
  */
 
-#ifndef __FLOAT_HPP
+#pragma once
-#define __FLOAT_HPP
 
 #include "types/sized.hpp"
 
@@ -77,4 +76,3 @@ namespace cruft {
     static_assert (sizeof(ieee_single ) == 4, "ieee_single must be 4 bytes");
     static_assert (sizeof(ieee_double ) == 8, "ieee_double must be 8 bytes");
 }
-#endif // __FLOAT_HPP

fourcc.hpp

@@ -6,8 +6,7 @@
  * Copyright 2011 Danny Robson <danny@nerdcruft.net>
  */
 
-#ifndef __UTIL_FOURCC_HPP
+#pragma once
-#define __UTIL_FOURCC_HPP
 
 #include <iosfwd>
 #include <cstdint>
@@ -24,7 +23,4 @@ namespace cruft {
     };
 
     std::ostream& operator<< (std::ostream&, cruft::fourcc);
-}
+}
-
-
-#endif

gcc.hpp

@@ -6,11 +6,8 @@
  * Copyright 2010 Danny Robson <danny@nerdcruft.net>
  */
 
-#ifndef __UTIL_GCC_HPP
+#pragma once
-#define __UTIL_GCC_HPP
 
 #define GCC_VERSION (__GNUC__       * 10000 + \
                      __GNUC_MINOR__ * 100   + \
                      __GNUC_PATCHLEVEL__)
-
-#endif

geom/cylinder.hpp

@@ -6,8 +6,7 @@
  * Copyright 2015 Danny Robson <danny@nerdcruft.net>
  */
 
-#ifndef __UTIL_GEOM_CYLINDER_HPP
+#pragma once
-#define __UTIL_GEOM_CYLINDER_HPP
 
 #include "../point.hpp"
 
@@ -24,5 +23,3 @@ namespace cruft::geom {
 
     using cylinder3f = cylinder<3,float>;
 }
-
-#endif

geom/sphere.hpp

@@ -6,8 +6,7 @@
  * Copyright 2015-2018 Danny Robson <danny@nerdcruft.net>
  */
 
-#ifndef __UTIL_GEOM_SPHERE_HPP
+#pragma once
-#define __UTIL_GEOM_SPHERE_HPP
 
 #include "../point.hpp"
 
@@ -53,5 +52,3 @@ namespace cruft::geom {
                INFINITY;
     }
 }
-
-#endif

hash/adler.hpp

@@ -6,8 +6,7 @@
  * Copyright 2010-2014 Danny Robson <danny@nerdcruft.net>
  */
 
-#ifndef __UTIL_HASH_ADLER_HPP
+#pragma once
-#define __UTIL_HASH_ADLER_HPP
 
 #include "fletcher.hpp"
 
@@ -20,6 +19,4 @@ namespace cruft::hash {
     public:
         adler32 ();
     };
-}
+}
-
-#endif

hash/fasthash.hpp

@@ -6,8 +6,7 @@
  * Copyright 2015 Danny Robson <danny@nerdcruft.net>
  */
 
-#ifndef __UTIL_HASH_FASTHASH_HPP
+#pragma once
-#define __UTIL_HASH_FASTHASH_HPP
 
 #include "../view.hpp"
 
@@ -34,6 +33,4 @@ namespace cruft::hash {
 
         digest_t operator() (uint64_t seed, cruft::view<const uint8_t*>) const;
     };
-}
+}
-
-#endif

hash/fnv1a.hpp

@@ -6,8 +6,7 @@
  * Copyright 2010-2015 Danny Robson <danny@nerdcruft.net>
  */
 
-#ifndef __UTIL_HASH_FNV1A_HPP
+#pragma once
-#define __UTIL_HASH_FNV1A_HPP
 
 #include "view.hpp"
 
@@ -22,6 +21,4 @@ namespace cruft::hash {
 
         digest_t operator() (cruft::view<const uint8_t*>) const noexcept;
     };
-}
+}
-
-#endif

hash/fwd.hpp

@@ -6,8 +6,7 @@
  * Copyright 2016, Danny Robson <danny@nerdcruft.net>
  */
 
-#ifndef __UTIL_HASH_FWD_HPP
+#pragma once
-#define __UTIL_HASH_FWD_HPP
 
 // The single function call hashes are light weight enough to include
 // directly, and are unlikely to change given their inherent
@@ -29,6 +28,4 @@ namespace cruft::hash {
     class crc;
 
     class xxhash;
-}
+}
-
-#endif

hash/murmur.hpp

@@ -6,11 +6,8 @@
  * Copyright 2015 Danny Robson <danny@nerdcruft.net>
  */
 
-#ifndef __UTIL_HASH_MURMUR_HPP
+#pragma once
-#define __UTIL_HASH_MURMUR_HPP
 
 #include "murmur/murmur1.hpp"
 #include "murmur/murmur2.hpp"
-#include "murmur/murmur3.hpp"
+#include "murmur/murmur3.hpp"
-
-#endif

hash/murmur/murmur1.hpp

@@ -6,8 +6,7 @@
  * Copyright 2015 Danny Robson <danny@nerdcruft.net>
  */
 
-#ifndef __UTIL_HASH_MURMUR_MURMUR1_HPP
+#pragma once
-#define __UTIL_HASH_MURMUR_MURMUR1_HPP
 
 #include "../../view.hpp"
 
@@ -41,6 +40,4 @@ namespace cruft::hash {
     private:
         seed_t m_seed;
     };
-}
+}
-
-#endif

hash/murmur/murmur2.hpp

@@ -6,8 +6,7 @@
  * Copyright 2015 Danny Robson <danny@nerdcruft.net>
  */
 
-#ifndef __UTIL_HASH_MURMUR_MURMUR2_HPP
+#pragma once
-#define __UTIL_HASH_MURMUR_MURMUR2_HPP
 
 #include "../../view.hpp"
 
@@ -79,7 +78,4 @@ namespace cruft::hash {
     private:
         seed_t m_seed;
     };
-}
+}
-
-#endif
-

hash/murmur/murmur3.hpp

@@ -6,8 +6,7 @@
  * Copyright 2015 Danny Robson <danny@nerdcruft.net>
  */
 
-#ifndef __UTIL_HASH_MURMUR_MURMUR3_HPP
+#pragma once
-#define __UTIL_HASH_MURMUR_MURMUR3_HPP
 
 #include "../../view.hpp"
 
@@ -50,7 +49,4 @@ namespace cruft::hash {
     using murmur3_32      = murmur3< 32,32>;
     using murmur3_128_x86 = murmur3<128,32>;
     using murmur3_128_x64 = murmur3<128,64>;
-}
+}
-
-#endif
-

hash/wang.hpp

@@ -6,8 +6,7 @@
  * Copyright 2010-2015 Danny Robson <danny@nerdcruft.net>
  */
 
-#ifndef __UTIL_HASH_WANG_HPP
+#pragma once
-#define __UTIL_HASH_WANG_HPP
 
 #include <cstdint>
 
@@ -44,6 +43,4 @@ namespace cruft::hash {
 
         return key;
     }
-}
+}
-
-#endif

io.hpp

@@ -6,8 +6,7 @@
  * Copyright 2010-2014 Danny Robson <danny@nerdcruft.net>
  */
 
-#ifndef __UTIL_IO_HPP
+#pragma once
-#define __UTIL_IO_HPP
 
 #include "std.hpp"
 #include "platform.hpp"
@@ -230,6 +229,4 @@ namespace cruft {
 #include "io_win32.hpp"
 #else
 #include "io_posix.hpp"
-#endif
+#endif
-
-#endif

io_posix.hpp

@@ -6,8 +6,7 @@
  * Copyright 2010-2016 Danny Robson <danny@nerdcruft.net>
  */
 
-#ifndef __UTIL_IO_POSIX_HPP
+#pragma once
-#define __UTIL_IO_POSIX_HPP
 
 #include "posix/fd.hpp"
 
@@ -81,6 +80,4 @@ namespace cruft {
     }
 
     typedef detail::posix::mapped_file mapped_file;
-}
+}
-
-#endif

library.hpp

@@ -6,8 +6,7 @@
  * Copyright 2015 Danny Robson <danny@nerdcruft.net>
  */
 
-#ifndef __UTIL_LIBRARY_HPP
+#pragma once
-#define __UTIL_LIBRARY_HPP
 
 #include "platform.hpp"
 
@@ -16,5 +15,3 @@
 #elif defined(PLATFORM_WIN32)
 #include "library_win32.hpp"
 #endif
-
-#endif

library_posix.hpp

@@ -6,8 +6,7 @@
  * Copyright 2015 Danny Robson <danny@nerdcruft.net>
  */
 
-#ifndef __UTIL_LIBRARY_POSIX_HPP
+#pragma once
-#define __UTIL_LIBRARY_POSIX_HPP
 
 #include <filesystem>
 
@@ -40,6 +39,4 @@ namespace cruft {
     }
 
     typedef detail::library_posix library;
-}
+}
-
-#endif

library_win32.hpp

@@ -6,8 +6,7 @@
  * Copyright 2015 Danny Robson <danny@nerdcruft.net>
  */
 
-#ifndef __UTIL_LIBRARY_WIN32_HPP
+#pragma once
-#define __UTIL_LIBRARY_WIN32_HPP
 
 #include "win32/windows.hpp"
 
@@ -46,5 +45,3 @@ namespace cruft {
 
     typedef detail::win32::library library;
 }
-
-#endif

memory/system.hpp

@@ -6,13 +6,10 @@
  * Copyright 2015 Danny Robson <danny@nerdcruft.net>
  */
 
-#ifndef __UTIL_MEMORY_SYSTEM_HPP
+#pragma once
-#define __UTIL_MEMORY_SYSTEM_HPP
 
 #include <cstddef>
 
 namespace cruft::memory {
     size_t pagesize (void);
-}
+}
-
-#endif

posix/fwd.hpp

@@ -6,13 +6,10 @@
  * Copyright 2016 Danny Robson <danny@nerdcruft.net>
  */
 
-#ifndef __CRUFT_UTIL_POSIX_FWD_HPP
+#pragma once
-#define __CRUFT_UTIL_POSIX_FWD_HPP
 
 namespace cruft::posix {
     class fd;
     class dir;
     class map;
 }
-
-#endif

posix/map.hpp

@@ -6,8 +6,7 @@
  * Copyright 2016 Danny Robson <danny@nerdcruft.net>
  */
 
-#ifndef __CRUFT_UTIL_POSIX_HPP
+#pragma once
-#define __CRUFT_UTIL_POSIX_HPP
 
 #include "fd.hpp"
 
@@ -51,5 +50,3 @@ namespace cruft::posix {
         size_t   m_size;
     };
 }
-
-#endif

quaternion.hpp

@@ -6,8 +6,7 @@
  * Copyright 2011-2018 Danny Robson <danny@nerdcruft.net>
  */
 
-#ifndef __UTIL_QUATERNION_HPP
+#pragma once
-#define __UTIL_QUATERNION_HPP
 
 #include "coord/traits.hpp"
 
@@ -255,6 +254,4 @@ namespace cruft {
     template <typename T>
     std::ostream&
     operator<< (std::ostream&, quaternion<T>);
-}
+}
-
-#endif

rational.hpp

@@ -6,8 +6,7 @@
  * Copyright 2014-2015 Danny Robson <danny@nerdcruft.net>
  */
 
-#ifndef __UTIL_RATIONAL_HPP
+#pragma once
-#define __UTIL_RATIONAL_HPP
 
 #include <type_traits>
 #include <iosfwd>
@@ -66,7 +65,4 @@ namespace cruft {
     ///////////////////////////////////////////////////////////////////////////
     template <typename ValueT>
     std::ostream& operator<< (std::ostream&, rational<ValueT>);
-};
+};
-
-
-#endif

roots/bisection.hpp

@@ -6,8 +6,7 @@
  * Copyright 2016 Danny Robson <danny@nerdcruft.net>
  */
 
-#ifndef __UTIL_ROOTS_BISECTION_HPP
+#pragma once
-#define __UTIL_ROOTS_BISECTION_HPP
 
 #include "../maths.hpp"
 
@@ -57,5 +56,3 @@ namespace cruft::roots {
         return (a + b) / T{2};
     }
 }
-
-#endif

stats.hpp

@@ -6,8 +6,7 @@
  * Copyright 2010 Danny Robson <danny@nerdcruft.net>
  */
 
-#ifndef __UTIL_STATS_HPP
+#pragma once
-#define __UTIL_STATS_HPP
 
 #include <iosfwd>
 
@@ -38,6 +37,4 @@ namespace cruft {
         template <typename T>
         std::ostream& operator<< (std::ostream&, const accumulator<T>&);
     }
-}
+}
-
-#endif

stream.hpp

@@ -6,8 +6,7 @@
  * Copyright 2011-2016 Danny Robson <danny@nerdcruft.net>
  */
 
-#ifndef __UTIL_STREAM_HPP
+#pragma once
-#define __UTIL_STREAM_HPP
 
 #include <iosfwd>
 #include <cstdint>
@@ -76,6 +75,3 @@ namespace cruft::stream {
     //---------------------------------------------------------------------
     std::ostream& operator<< (std::ostream&, bits);
 }
-
-
-#endif

term.hpp

@@ -6,8 +6,7 @@
  * Copyright 2016 Danny Robson <danny@nerdcruft.net>
  */
 
-#ifndef __UTIL_TERM_HPP
+#pragma once
-#define __UTIL_TERM_HPP
 
 #include <iosfwd>
 
@@ -55,6 +54,4 @@ namespace cruft::term {
         std::ostream& operator<< (std::ostream&, code);
         std::ostream& operator<< (std::ostream&, graphics);
     }
-}
+}
-
-#endif

time.hpp

@@ -6,8 +6,7 @@
  * Copyright 2010-2016 Danny Robson <danny@nerdcruft.net>
  */
 
-#ifndef __UTIL_TIME_HPP
+#pragma once
-#define __UTIL_TIME_HPP
 
 #include "stats.hpp"
 
@@ -93,5 +92,3 @@ namespace cruft {
             stats::accumulator<uint64_t> m_series;
     };
 }
-
-#endif

types/string.hpp

@@ -6,13 +6,10 @@
  * Copyright 2011 Danny Robson <danny@nerdcruft.net>
  */
 
-#ifndef __UTIL_TYPES_STRING_HPP
+#pragma once
-#define __UTIL_TYPES_STRING_HPP
 
 #include <string>
 
 template <typename T>
 std::string
 type_to_string (void);
-
-#endif

version.hpp

@@ -6,8 +6,7 @@
  * Copyright 2010 Danny Robson <danny@nerdcruft.net>
  */
 
-#ifndef __UTIL_VERSION_HPP
+#pragma once
-#define __UTIL_VERSION_HPP
 
 #include <array>
 #include <string>
@@ -89,7 +88,4 @@ namespace cruft {
     };
 
     std::ostream& operator<< (std::ostream& os, const cruft::version& rhs);
-}
+}
-
-
-#endif // __VERSION_HPP

win32/registry.hpp

@@ -6,8 +6,7 @@
  * Copyright 2015 Danny Robson <danny@nerdcruft.net>
  */
 
-#ifndef __UTIL_WIN32_REGISTRY_HPP
+#pragma once
-#define __UTIL_WIN32_REGISTRY_HPP
 
 #include "windows.hpp"
 
@@ -60,5 +59,3 @@ namespace cruft::win32 {
         HKEY m_handle;
     };
 }
-
-#endif

zlib.hpp

@@ -6,8 +6,7 @@
  * Copyright 2013 Danny Robson <danny@nerdcruft.net>
  */
 
-#ifndef __UTIL_ZLIB_HPP
+#pragma once
-#define __UTIL_ZLIB_HPP
 
 #include <stdexcept>
 #include <string>
@@ -59,6 +58,4 @@ namespace cruft {
                 { ; }
         };
     }
-}
+}
-
-#endif