Merge pull request #242 from elbeno/workaround-clang-udl-bug

Author: lukevalenty

include/stdx/compiler.hpp

@@ -22,6 +22,14 @@
 #endif
 #endif
 
+#ifndef CONSTEVAL_UDL
+#if defined(__clang__)
+#define CONSTEVAL_UDL constexpr
+#else
+#define CONSTEVAL_UDL CONSTEVAL
+#endif
+#endif
+
 #ifndef USING_ATTR_NS
 #if defined(__clang__)
 #define USING_ATTR_NS using clang:

include/stdx/ct_format.hpp

@@ -55,7 +55,7 @@ template <typename Str> format_result(Str) -> format_result<Str, tuple<>>;
 
 inline namespace literals {
 inline namespace ct_string_literals {
-template <ct_string S> CONSTEVAL auto operator""_fmt_res() {
+template <ct_string S> CONSTEVAL_UDL auto operator""_fmt_res() {
     return format_result{cts_t<S>{}};
 }
 } // namespace ct_string_literals

include/stdx/ct_string.hpp

@@ -162,9 +162,11 @@ template <ct_string Value> CONSTEVAL auto ct() { return cts_t<Value>{}; }
 
 inline namespace literals {
 inline namespace ct_string_literals {
-template <ct_string S> CONSTEVAL auto operator""_cts() { return S; }
+template <ct_string S> CONSTEVAL_UDL auto operator""_cts() { return S; }
 
-template <ct_string S> CONSTEVAL auto operator""_ctst() { return cts_t<S>{}; }
+template <ct_string S> CONSTEVAL_UDL auto operator""_ctst() {
+    return cts_t<S>{};
+}
 } // namespace ct_string_literals
 } // namespace literals
 } // namespace v1

include/stdx/tuple.hpp

@@ -18,7 +18,7 @@ using index_constant = std::integral_constant<std::size_t, I>;
 template <std::size_t I> constexpr static index_constant<I> index{};
 
 inline namespace literals {
-template <char... Chars> CONSTEVAL auto operator""_idx() {
+template <char... Chars> CONSTEVAL_UDL auto operator""_idx() {
     return index<parse_literal<std::size_t, Chars...>()>;
 }
 } // namespace literals

include/stdx/udls.hpp

@@ -78,7 +78,7 @@ template <auto I> using constant = std::integral_constant<decltype(I), I>;
 template <auto I> constexpr static constant<I> _c{};
 
 inline namespace literals {
-template <char... Chars> CONSTEVAL auto operator""_c() {
+template <char... Chars> CONSTEVAL_UDL auto operator""_c() {
     return _c<parse_literal<std::uint32_t, Chars...>()>;
 }
 } // namespace literals
@@ -89,58 +89,60 @@ enum struct length_t : std::uint32_t {};
 
 inline namespace literals {
 // NOLINTBEGIN(google-runtime-int)
-CONSTEVAL auto operator""_lsb(unsigned long long int n) -> lsb_t {
+CONSTEVAL_UDL auto operator""_lsb(unsigned long long int n) -> lsb_t {
     return static_cast<lsb_t>(n);
 }
-CONSTEVAL auto operator""_msb(unsigned long long int n) -> msb_t {
+CONSTEVAL_UDL auto operator""_msb(unsigned long long int n) -> msb_t {
     return static_cast<msb_t>(n);
 }
-CONSTEVAL auto operator""_len(unsigned long long int n) -> length_t {
+CONSTEVAL_UDL auto operator""_len(unsigned long long int n) -> length_t {
     return static_cast<length_t>(n);
 }
 // NOLINTEND(google-runtime-int)
 } // namespace literals
 
 inline namespace literals {
-CONSTEVAL auto operator""_b(char const *, std::size_t) -> bool { return true; }
-CONSTEVAL auto operator""_true(char const *, std::size_t) -> bool {
+CONSTEVAL_UDL auto operator""_b(char const *, std::size_t) -> bool {
     return true;
 }
-CONSTEVAL auto operator""_false(char const *, std::size_t) -> bool {
+CONSTEVAL_UDL auto operator""_true(char const *, std::size_t) -> bool {
+    return true;
+}
+CONSTEVAL_UDL auto operator""_false(char const *, std::size_t) -> bool {
     return false;
 }
 
 // NOLINTBEGIN(google-runtime-int)
-CONSTEVAL auto operator""_k(unsigned long long int n)
+CONSTEVAL_UDL auto operator""_k(unsigned long long int n)
     -> unsigned long long int {
     return n * 1'000u;
 }
-CONSTEVAL auto operator""_M(unsigned long long int n)
+CONSTEVAL_UDL auto operator""_M(unsigned long long int n)
     -> unsigned long long int {
     return n * 1'000'000u;
 }
-CONSTEVAL auto operator""_G(unsigned long long int n)
+CONSTEVAL_UDL auto operator""_G(unsigned long long int n)
     -> unsigned long long int {
     return n * 1'000'000'000u;
 }
 
-CONSTEVAL auto operator""_ki(unsigned long long int n)
+CONSTEVAL_UDL auto operator""_ki(unsigned long long int n)
     -> unsigned long long int {
     return n * 1'024u;
 }
-CONSTEVAL auto operator""_Mi(unsigned long long int n)
+CONSTEVAL_UDL auto operator""_Mi(unsigned long long int n)
     -> unsigned long long int {
     return n * 1'024ull * 1'024ull;
 }
-CONSTEVAL auto operator""_Gi(unsigned long long int n)
+CONSTEVAL_UDL auto operator""_Gi(unsigned long long int n)
     -> unsigned long long int {
     return n * 1'024ull * 1'024ull * 1'024ull;
 }
 
 // NOLINTBEGIN(cppcoreguidelines-macro-usage)
 
 #define STDX_SMALL_INT_LITERAL_DEF(x)                                          \
-    CONSTEVAL auto operator""_##x(char const *, std::size_t)                   \
+    CONSTEVAL_UDL auto operator""_##x(char const *, std::size_t)               \
         ->std::integral_constant<std::size_t, x##u> {                          \
         return {};                                                             \
     }