tweaks

.github/workflows/ci.yml

@@ -47,7 +47,7 @@ jobs:
           cmake -B build
           -DCMAKE_BUILD_TYPE=Debug
           -DCMAKE_CXX_STANDARD=23
-          -Dfrozen.tests=ON
+          "-Dfrozen.tests=ON"
           -DCMAKE_VERBOSE_MAKEFILE=ON
           ${{ matrix.cmake_args }}
 

CMakeLists.txt

@@ -22,6 +22,20 @@ include(CTest)
 include(GNUInstallDirs)
 include(cmake/detect_cxx_version.cmake)
 
+# ###################### sccache #######################
+find_program(SCCACHE_PROGRAM sccache)
+if(SCCACHE_PROGRAM)
+    message(STATUS "sccache found: ${SCCACHE_PROGRAM}")
+    set(CMAKE_C_COMPILER_LAUNCHER "${SCCACHE_PROGRAM}")
+    set(CMAKE_CXX_COMPILER_LAUNCHER "${SCCACHE_PROGRAM}")
+else()
+    message(STATUS "sccache not found; building without a compiler cache")
+endif()
+
+if(MSVC)
+    set(CMAKE_MSVC_DEBUG_INFORMATION_FORMAT "$<$<CONFIG:Debug,RelWithDebInfo>:Embedded>")
+endif()
+
 #
 # The `frozen.testing`, `frozen.benchmark`, and `frozen.coverage` options
 # only appear as cmake-gui and ccmake options iff frozen is the highest

include/frozen/algorithm.h

@@ -20,8 +20,7 @@
  * under the License.
  */
 
-#ifndef FROZEN_LETITGO_ALGORITHM_H
-#define FROZEN_LETITGO_ALGORITHM_H
+#pragma once
 
 // Require C++23 or later
 #if defined(_MSVC_LANG)
@@ -270,5 +269,3 @@ namespace frozen
     }
 
 }  // namespace frozen
-
-#endif

include/frozen/bits/algorithms.h

@@ -20,8 +20,7 @@
  * under the License.
  */
 
-#ifndef FROZEN_LETITGO_BITS_ALGORITHMS_H
-#define FROZEN_LETITGO_BITS_ALGORITHMS_H
+#pragma once
 
 #include "frozen/bits/basic_types.h"
 
@@ -266,5 +265,3 @@ namespace frozen::bits
     }
 
 }  // namespace frozen::bits
-
-#endif

include/frozen/bits/basic_types.h

@@ -20,8 +20,7 @@
  * under the License.
  */
 
-#ifndef FROZEN_LETITGO_BASIC_TYPES_H
-#define FROZEN_LETITGO_BASIC_TYPES_H
+#pragma once
 
 #include "frozen/bits/constexpr_assert.h"
 #include "frozen/bits/exceptions.h"
@@ -247,5 +246,3 @@ namespace frozen::bits
     };
 
 }  // namespace frozen::bits
-
-#endif

include/frozen/bits/constexpr_assert.h

@@ -20,14 +20,11 @@
  * under the License.
  */
 
-#ifndef FROZEN_LETITGO_CONSTEXPR_ASSERT_H
-#define FROZEN_LETITGO_CONSTEXPR_ASSERT_H
+#pragma once
 
 #include <cassert>
 #include <utility>
 
 inline void constexpr_assert_failed() {}
 
 #define constexpr_assert(cond, msg) ((void) ((cond) ? 0 : (constexpr_assert_failed(), 0)))
-
-#endif

include/frozen/bits/defines.h

@@ -20,8 +20,7 @@
  * under the License.
  */
 
-#ifndef FROZEN_LETITGO_DEFINES_H
-#define FROZEN_LETITGO_DEFINES_H
+#pragma once
 
 // C++23 guarantees all previously-detected features:
 // - string_view (C++17)
@@ -31,5 +30,3 @@
 // The feature-detection macros have been removed. This header
 // is here only for backward compatibility to the original
 // frozen implementation.
-
-#endif  // FROZEN_LETITGO_DEFINES_H

include/frozen/bits/elsa.h

@@ -20,8 +20,7 @@
  * under the License.
  */
 
-#ifndef FROZEN_LETITGO_ELSA_H
-#define FROZEN_LETITGO_ELSA_H
+#pragma once
 
 #include <concepts>
 #include <type_traits>
@@ -64,5 +63,3 @@ namespace frozen
     template <class T = void>
     using anna = elsa<T>;
 }  // namespace frozen
-
-#endif

include/frozen/bits/elsa_std.h

@@ -1,5 +1,4 @@
-#ifndef FROZEN_LETITGO_BITS_ELSA_STD_H
-#define FROZEN_LETITGO_BITS_ELSA_STD_H
+#pragma once
 
 #include "elsa.h"
 #include "hash_string.h"
@@ -39,5 +38,3 @@ namespace frozen
     };
 
 }  // namespace frozen
-
-#endif  // FROZEN_LETITGO_BITS_ELSA_STD_H

include/frozen/bits/exceptions.h

@@ -20,8 +20,7 @@
  * under the License.
  */
 
-#ifndef FROZEN_LETITGO_EXCEPTIONS_H
-#define FROZEN_LETITGO_EXCEPTIONS_H
+#pragma once
 
 #if defined(FROZEN_NO_EXCEPTIONS) || (defined(_MSC_VER) && !defined(_CPPUNWIND)) || \
     (!defined(_MSC_VER) && !defined(__cpp_exceptions))
@@ -35,5 +34,3 @@
     #define FROZEN_THROW_OR_ABORT(err) throw err
 
 #endif
-
-#endif

include/frozen/bits/hash_string.h

@@ -1,31 +1,40 @@
-#ifndef FROZEN_LETITGO_BITS_HASH_STRING_H
-#define FROZEN_LETITGO_BITS_HASH_STRING_H
+#pragma once
 
 #include <cstddef>
 
 namespace frozen
 {
+    // djb2 hash constants
+    constexpr std::size_t djb2_initial = 5381;
+    constexpr std::size_t djb2_multiplier = 33;
+
+    // FNV-1 hash constants (32-bit)
+    constexpr std::size_t fnv_offset_basis = 0x811c9dc5;
+    constexpr std::size_t fnv_prime = 0x01000193;
+    constexpr std::size_t fnv_shift_bits = 8;
 
     template <typename String>
     constexpr std::size_t hash_string(const String& value)
     {
-        std::size_t d = 5381;
-        for (const auto& c: value)
-            d = d * 33 + static_cast<std::size_t>(c);
-        return d;
+        std::size_t hash = djb2_initial;
+        for (const auto& chr: value)
+        {
+            hash = (hash * djb2_multiplier) + static_cast<std::size_t>(chr);
+        }
+        return hash;
     }
 
     // https://en.wikipedia.org/wiki/Fowler%E2%80%93Noll%E2%80%93Vo_hash_function
     // With the lowest bits removed, based on experimental setup.
     template <typename String>
     constexpr std::size_t hash_string(const String& value, std::size_t seed)
     {
-        std::size_t d = (0x811c9dc5 ^ seed) * static_cast<std::size_t>(0x01000193);
-        for (const auto& c: value)
-            d = (d ^ static_cast<std::size_t>(c)) * static_cast<std::size_t>(0x01000193);
-        return d >> 8;
+        std::size_t hash = (fnv_offset_basis ^ seed) * static_cast<std::size_t>(fnv_prime);
+        for (const auto& chr: value)
+        {
+            hash = (hash ^ static_cast<std::size_t>(chr)) * static_cast<std::size_t>(fnv_prime);
+        }
+        return hash >> fnv_shift_bits;
     }
 
 }  // namespace frozen
-
-#endif  // FROZEN_LETITGO_BITS_HASH_STRING_H

include/frozen/bits/mpl.h

@@ -20,8 +20,7 @@
  * under the License.
  */
 
-#ifndef FROZEN_LETITGO_BITS_MPL_H
-#define FROZEN_LETITGO_BITS_MPL_H
+#pragma once
 
 #include <utility>
 
@@ -53,5 +52,3 @@ namespace frozen::bits
     using remove_cv_t = typename remove_cv<T>::type;
 
 }  // namespace frozen::bits
-
-#endif

include/frozen/bits/pmh.h

@@ -21,13 +21,11 @@
  */
 
 // inspired from http://stevehanov.ca/blog/index.php?id=119
-#ifndef FROZEN_LETITGO_PMH_H
-#define FROZEN_LETITGO_PMH_H
+#pragma once
 
 #include "frozen/bits/algorithms.h"
 #include "frozen/bits/basic_types.h"
 
-#include <array>
 #include <cstddef>
 #include <cstdint>
 #include <limits>
@@ -282,5 +280,3 @@ namespace frozen::bits
     }
 
 }  // namespace frozen::bits
-
-#endif

include/frozen/bits/version.h

@@ -20,8 +20,7 @@
  * under the License.
  */
 
-#ifndef FROZEN_LETITGO_VERSION_H
-#define FROZEN_LETITGO_VERSION_H
+#pragma once
 
 // Require C++23 or later
 #if defined(_MSVC_LANG)
@@ -35,5 +34,3 @@
 #define FROZEN_MAJOR_VERSION 2
 #define FROZEN_MINOR_VERSION 0
 #define FROZEN_PATCH_VERSION 0
-
-#endif

include/frozen/map.h

@@ -20,8 +20,7 @@
  * under the License.
  */
 
-#ifndef FROZEN_LETITGO_MAP_H
-#define FROZEN_LETITGO_MAP_H
+#pragma once
 
 // Require C++23 or later
 #if defined(_MSVC_LANG)
@@ -38,6 +37,7 @@
 #include "frozen/bits/mpl.h"
 #include "frozen/bits/version.h"
 
+#include <functional>
 #include <iterator>
 #include <utility>
 
@@ -456,5 +456,3 @@ namespace frozen
     }
 
 }  // namespace frozen
-
-#endif

include/frozen/random.h

@@ -20,8 +20,7 @@
  * under the License.
  */
 
-#ifndef FROZEN_LETITGO_RANDOM_H
-#define FROZEN_LETITGO_RANDOM_H
+#pragma once
 
 // Require C++23 or later
 #if defined(_MSVC_LANG)
@@ -104,5 +103,3 @@ namespace frozen
     using default_prg_t = minstd_rand;
 
 }  // namespace frozen
-
-#endif

include/frozen/set.h

@@ -20,8 +20,7 @@
  * under the License.
  */
 
-#ifndef FROZEN_SET_H
-#define FROZEN_SET_H
+#pragma once
 
 // Require C++23 or later
 #if defined(_MSVC_LANG)
@@ -36,6 +35,7 @@
 #include "frozen/bits/basic_types.h"
 #include "frozen/bits/version.h"
 
+#include <functional>
 #include <iterator>
 #include <utility>
 
@@ -315,5 +315,3 @@ namespace frozen
     set(T, Args...) -> set<T, sizeof...(Args) + 1>;
 
 }  // namespace frozen
-
-#endif

include/frozen/string.h

@@ -1,21 +1,8 @@
-#ifndef FROZEN_LETITGO_STRING_H
-#define FROZEN_LETITGO_STRING_H
-
-// Require C++23 or later
-#if defined(_MSVC_LANG)
-    #if _MSVC_LANG < 202302L
-        #error "frozen/string.h requires C++23 or later. Compile with /std:c++latest or /std:c++23."
-    #endif
-#elif __cplusplus < 202302L
-    #error "frozen/string.h requires C++23 or later. Compile with -std=c++23 or later."
-#endif
-
-#include "frozen/bits/elsa.h"
-#include "frozen/bits/hash_string.h"
+#pragma once
+
 #include "frozen/bits/version.h"
 
 #include <cstddef>
-#include <functional>
 #include <string_view>
 
 namespace frozen
@@ -58,5 +45,3 @@ namespace frozen
     }  // namespace string_literals
 
 }  // namespace frozen
-
-#endif

include/frozen/unordered_map.h

@@ -20,8 +20,7 @@
  * under the License.
  */
 
-#ifndef FROZEN_LETITGO_UNORDERED_MAP_H
-#define FROZEN_LETITGO_UNORDERED_MAP_H
+#pragma once
 
 // Require C++23 or later
 #if defined(_MSVC_LANG)
@@ -253,5 +252,3 @@ namespace frozen
     }
 
 }  // namespace frozen
-
-#endif

include/frozen/unordered_set.h

@@ -20,8 +20,7 @@
  * under the License.
  */
 
-#ifndef FROZEN_LETITGO_UNORDERED_SET_H
-#define FROZEN_LETITGO_UNORDERED_SET_H
+#pragma once
 
 // Require C++23 or later
 #if defined(_MSVC_LANG)
@@ -39,6 +38,7 @@
 #include "frozen/bits/version.h"
 #include "frozen/random.h"
 
+#include <functional>
 #include <utility>
 
 namespace frozen
@@ -211,5 +211,3 @@ namespace frozen
     unordered_set(T, Args...) -> unordered_set<T, sizeof...(Args) + 1>;
 
 }  // namespace frozen
-
-#endif