procxx
/
kepka
mirror of https://github.com/procxx/kepka.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Adapt code to compile by MSVC 2015, remove conditional compilation (#105) 

Fixes workaround introduced in #101.

Author: @anatoly-spb.
Related to: #17.
This commit is contained in:
Anatoly Shirokov 2018-02-13 21:19:05 +03:00 committed by Alex
parent b1c7c6fc61
commit e1a947e850
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Telegram/SourceFiles/base/assertion.h
View File

@ -30,6 +30,8 @@ void log(const char *message, const char *file, int line);
// Release build assertions. // Release build assertions.
inline constexpr void noop() { inline constexpr void noop() {
// MSVC2015 requires return to suppress warning: a constexpr function must contain exactly one return statement
return void();
} }
[[noreturn]] inline void fail(const char *message, const char *file, int line) { [[noreturn]] inline void fail(const char *message, const char *file, int line) {
@ -43,14 +45,9 @@ inline constexpr void noop() {
std::abort(); std::abort();
} }
// Since MSVC 2015 cannot understand "constexpr void" (void is literal since C++14) inline constexpr void validate(bool condition, const char *message, const char *file, int line) {
// we have to use conditional compilation // MSVC2015 requires return to suppress error C3249: illegal statement or sub-expression for 'constexpr' function
inline return (GSL_UNLIKELY(!(condition))) ? fail(message, file, line) : noop();
#if !defined(_MSC_VER) || (_MSC_VER > 1900)
constexpr
#endif
void validate(bool condition, const char *message, const char *file, int line) {
(GSL_UNLIKELY(!(condition))) ? fail(message, file, line) : noop();
} }