Amebis/stdex
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix to support pre-C++17

Browse Source 
Signed-off-by: Simon Rozman <simon@rozman.si>
This commit is contained in:
Simon Rozman 2023-09-14 13:01:16 +02:00
parent 13703b1747
commit 51d7ee3493
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/stdex/compat.hpp
View File

@ -162,6 +162,12 @@
#endif #endif
#endif #endif
#if _HAS_CXX17
#define _Constexpr_ constexpr
#else
#define _Constexpr_
#endif
#ifdef _MSC_VER #ifdef _MSC_VER
#define _Deprecated_(message) __declspec(deprecated(message)) #define _Deprecated_(message) __declspec(deprecated(message))
#else #else

6
include/stdex/unicode.hpp
View File

@ -101,7 +101,7 @@ namespace stdex
return; return;
} }
if constexpr (sizeof(T_from) == sizeof(char) && sizeof(T_to) == sizeof(wchar_t)) { if _Constexpr_ (sizeof(T_from) == sizeof(char) && sizeof(T_to) == sizeof(wchar_t)) {
assert(count_src < INT_MAX || count_src == SIZE_MAX); assert(count_src < INT_MAX || count_src == SIZE_MAX);
// Try to convert to stack buffer first. // Try to convert to stack buffer first.
@ -124,7 +124,7 @@ namespace stdex
throw std::runtime_error("MultiByteToWideChar failed"); throw std::runtime_error("MultiByteToWideChar failed");
} }
if constexpr (sizeof(T_from) == sizeof(wchar_t) && sizeof(T_to) == sizeof(char)) { if _Constexpr_ (sizeof(T_from) == sizeof(wchar_t) && sizeof(T_to) == sizeof(char)) {
assert(count_src < INT_MAX || count_src == SIZE_MAX); assert(count_src < INT_MAX || count_src == SIZE_MAX);
// Try to convert to stack buffer first. // Try to convert to stack buffer first.
@ -147,7 +147,7 @@ namespace stdex
throw std::runtime_error("WideCharToMultiByte failed"); throw std::runtime_error("WideCharToMultiByte failed");
} }
if constexpr (sizeof(T_from) == sizeof(char) && sizeof(T_to) == sizeof(char)) { if _Constexpr_ (sizeof(T_from) == sizeof(char) && sizeof(T_to) == sizeof(char)) {
assert(count_src < INT_MAX || count_src == SIZE_MAX); assert(count_src < INT_MAX || count_src == SIZE_MAX);
// Try to convert to stack buffer first. // Try to convert to stack buffer first.