updated build system

support/include/utils/collection.hpp

@@ -73,11 +73,9 @@ inline auto includes(const col_t &collection,
 template <typename val_t>
 [[nodiscard]] inline auto from_hex_string_t(std::string_view str,
                                             val_t &val) -> bool {
-  static constexpr const auto base16{16};
+  REPERTORY_USES_FUNCTION_NAME();
 
-  static constexpr const std::string_view function_name{
-      static_cast<const char *>(__FUNCTION__),
-  };
+  static constexpr const auto base16{16};
 
   try {
     val.clear();

support/include/utils/com_init_wrapper.hpp

@@ -26,20 +26,27 @@
 #include "utils/config.hpp"
 
 namespace repertory::utils {
-class com_init_wrapper {
-public:
+struct com_init_wrapper final {
   com_init_wrapper()
-      : uninit_(
+      : initialized_(
             SUCCEEDED(::CoInitializeEx(nullptr, COINIT_APARTMENTTHREADED))) {}
 
+  com_init_wrapper(const com_init_wrapper &) = delete;
+  com_init_wrapper(com_init_wrapper &&) = delete;
+
   ~com_init_wrapper() {
-    if (uninit_) {
+    if (initialized_) {
       ::CoUninitialize();
     }
   }
 
+  auto operator=(const com_init_wrapper &) -> com_init_wrapper & = delete;
+  auto operator=(com_init_wrapper &&) -> com_init_wrapper & = delete;
+
+  [[nodiscard]] auto is_initialized() const -> bool { return initialized_; }
+
 private:
-  BOOL uninit_;
+  BOOL initialized_;
 };
 } // namespace repertory::utils
 

support/include/utils/config.hpp

@@ -38,7 +38,9 @@
 #endif // defined(PROJECT_ENABLE_WINFSP)
 
 #include <direct.h>
+#if !defined(__cplusplus)
 #include <errno.h>
+#endif // !defined(__cplusplus)
 #include <fcntl.h>
 #include <io.h>
 #include <iphlpapi.h>
@@ -49,10 +51,14 @@
 #include <shellapi.h>
 #include <shlobj.h>
 #include <shlwapi.h>
+#if !defined(__cplusplus)
 #include <stdio.h>
+#endif // !defined(__cplusplus)
 #include <sys/stat.h>
 #include <sys/types.h>
+#if !defined(__cplusplus)
 #include <time.h>
+#endif // !defined(__cplusplus)
 #else // !defined(_WIN32)
 #include <arpa/inet.h>
 #include <dirent.h>
@@ -65,9 +71,9 @@
 #include <sys/socket.h>
 #if defined(__LFS64__)
 #include <sys/stat64.h>
-#else
+#else // !defined(__LFS64__)
 #include <sys/stat.h>
-#endif
+#endif // defined(__LFS64__)
 
 #if defined(__linux__)
 #include <sys/statfs.h>
@@ -98,6 +104,7 @@
 #include <array>
 #include <atomic>
 #include <bit>
+#include <cerrno>
 #include <chrono>
 #include <ciso646>
 #include <climits>
@@ -105,9 +112,11 @@
 #include <condition_variable>
 #include <csignal>
 #include <cstdint>
+#include <cstdio>
 #include <cstdlib>
 #include <cstring>
 #include <ctime>
+#include <ctime>
 #include <deque>
 #include <filesystem>
 #include <fstream>
@@ -466,4 +475,9 @@ using http_ranges = std::vector<http_range>;
 } // namespace repertory
 #endif // defined(__cplusplus)
 
+#define REPERTORY_USES_FUNCTION_NAME()  \
+  static constexpr const std::string_view function_name{ \
+      static_cast<const char *>(__FUNCTION__), \
+  }
+
 #endif // REPERTORY_INCLUDE_UTILS_CONFIG_HPP_