blankie
/
pixwhile
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use constinit instead of consteval

This commit is contained in:
blankie 2023-05-12 17:32:09 +07:00
parent 2c8c0ab45e
commit c37080d85a
Signed by: blankie
GPG Key ID: CC15FC822C7F61F5
2 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
routes/css.cpp
View File

@ -134,11 +134,7 @@ static const constexpr char css[] = R"EOF(
)EOF"; )EOF";
#define CSS_LEN sizeof(css) / sizeof(css[0]) - 1 #define CSS_LEN sizeof(css) / sizeof(css[0]) - 1
#ifdef __cpp_consteval constinit const uint64_t css_hash = FastHash(css, CSS_LEN, 0);
const uint64_t css_hash = FastHashConstEval(css, CSS_LEN, 0);
#else
const uint64_t css_hash = FastHash(css, CSS_LEN, 0);
#endif
void css_route(const httplib::Request& req, httplib::Response& res) { void css_route(const httplib::Request& req, httplib::Response& res) {
res.set_header("ETag", std::string(1, '"') + std::to_string(css_hash) + '"'); res.set_header("ETag", std::string(1, '"') + std::to_string(css_hash) + '"');

10
thirdparty/FastHash.h vendored
View File

@ -1,5 +1,5 @@
// https://github.com/KoneLinx/small_ECS/blob/master/FastHash.h // https://github.com/KoneLinx/small_ECS/blob/master/FastHash.h
// but slightly modified to add FastHashConstEval and abandon ranges // but slightly modified to abandon ranges
// Copyright(C) 2021 Kobe Vrijsen <kobevrijsen@posteo.be> // Copyright(C) 2021 Kobe Vrijsen <kobevrijsen@posteo.be>
// //
@ -39,8 +39,6 @@
#pragma once #pragma once
#include <version>
// Compression function for Merkle-Damgard construction. // Compression function for Merkle-Damgard construction.
// This function is generated using the framework provided. // This function is generated using the framework provided.
//#define mix(h) ({ //#define mix(h) ({
@ -76,9 +74,3 @@ constexpr uint64_t FastHash(const char* str, size_t size, uint64_t seed/*, uint6
return mix(h); return mix(h);
} }
#ifdef __cpp_consteval
consteval uint64_t FastHashConstEval(const char* str, size_t size, uint64_t seed) {
return FastHash(str, size, seed);
}
#endif