diff options
| author | Martin Ridgers <[email protected]> | 2022-01-11 12:16:41 +0100 |
|---|---|---|
| committer | Martin Ridgers <[email protected]> | 2022-01-13 08:44:39 +0100 |
| commit | b08e888b4052e760515cdce4f4fc2471d1569199 (patch) | |
| tree | 02e0e23fc8fb3ebf083fdfbb811f526426069dff | |
| parent | Handle PartialOnError cache policy when using z$ rest endpoint. (diff) | |
| download | zen-b08e888b4052e760515cdce4f4fc2471d1569199.tar.xz zen-b08e888b4052e760515cdce4f4fc2471d1569199.zip | |
Moved "concepts" include to zencore.h as toolchain support is spotty
| -rw-r--r-- | zencore/include/zencore/intmath.h | 1 | ||||
| -rw-r--r-- | zencore/include/zencore/refcount.h | 1 | ||||
| -rw-r--r-- | zencore/include/zencore/string.h | 1 | ||||
| -rw-r--r-- | zencore/include/zencore/zencore.h | 1 | ||||
| -rw-r--r-- | zenserver/cache/structuredcachestore.cpp | 2 | ||||
| -rw-r--r-- | zenstore/include/zenstore/cas.h | 1 |
6 files changed, 1 insertions, 6 deletions
diff --git a/zencore/include/zencore/intmath.h b/zencore/include/zencore/intmath.h index b4a0b6796..f24caed6e 100644 --- a/zencore/include/zencore/intmath.h +++ b/zencore/include/zencore/intmath.h @@ -5,7 +5,6 @@ #include "zencore.h" #include <stdint.h> -#include <concepts> ////////////////////////////////////////////////////////////////////////// diff --git a/zencore/include/zencore/refcount.h b/zencore/include/zencore/refcount.h index 5c8b70ef6..0324b94cc 100644 --- a/zencore/include/zencore/refcount.h +++ b/zencore/include/zencore/refcount.h @@ -5,7 +5,6 @@ #include "zencore.h" #include <compare> -#include <concepts> namespace zen { diff --git a/zencore/include/zencore/string.h b/zencore/include/zencore/string.h index dba6843cf..1afacc089 100644 --- a/zencore/include/zencore/string.h +++ b/zencore/include/zencore/string.h @@ -9,7 +9,6 @@ #include <string.h> #include <charconv> #include <codecvt> -#include <concepts> #include <optional> #include <span> #include <string_view> diff --git a/zencore/include/zencore/zencore.h b/zencore/include/zencore/zencore.h index 12eacfb00..0b45b12cf 100644 --- a/zencore/include/zencore/zencore.h +++ b/zencore/include/zencore/zencore.h @@ -123,6 +123,7 @@ // At the time of writing only ver >= 13 of LLVM's libc++ has an implementation // of std::integral. Some platforms like Ubuntu and Mac OS are still on 12. #if defined(__cpp_lib_concepts) +# include <concepts> template <class T> concept Integral = std::integral<T>; template <class T> concept SignedIntegral = std::signed_integral<T>; template <class T> concept UnsignedIntegral = std::unsigned_integral<T>; diff --git a/zenserver/cache/structuredcachestore.cpp b/zenserver/cache/structuredcachestore.cpp index 68b7e2a48..0663307cb 100644 --- a/zenserver/cache/structuredcachestore.cpp +++ b/zenserver/cache/structuredcachestore.cpp @@ -25,8 +25,6 @@ # include <zencore/windows.h> #endif -#include <concepts> - ZEN_THIRD_PARTY_INCLUDES_START #include <fmt/core.h> #include <gsl/gsl-lite.hpp> diff --git a/zenstore/include/zenstore/cas.h b/zenstore/include/zenstore/cas.h index 1823fd630..7a7233c1c 100644 --- a/zenstore/include/zenstore/cas.h +++ b/zenstore/include/zenstore/cas.h @@ -11,7 +11,6 @@ #include <zencore/timer.h> #include <atomic> -#include <concepts> #include <filesystem> #include <functional> #include <memory> |