Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed compilation on GCC < 5.1 (#4552)

Browse Source 
Fixes #4544
This commit is contained in:
Lemongrass3110 2020-01-22 16:06:58 +01:00 committed by GitHub
parent 87f66ed0f0
commit a4c75d4771
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/common/utilities.cpp
View File

@ -9,6 +9,10 @@
#include <numeric> //iota #include <numeric> //iota
#include <string> #include <string>
#ifndef __has_builtin
#define __has_builtin(x) 0
#endif
struct cScopeTimer::sPimpl { struct cScopeTimer::sPimpl {
std::chrono::steady_clock::time_point start; std::chrono::steady_clock::time_point start;
std::chrono::steady_clock::time_point end; std::chrono::steady_clock::time_point end;
@ -66,7 +70,7 @@ int levenshtein(const std::string &s1, const std::string &s2)
} }
bool rathena::util::safe_addition( int64 a, int64 b, int64& result ){ bool rathena::util::safe_addition( int64 a, int64 b, int64& result ){
#if defined(__GNUC__) || defined(__clang__) #if __has_builtin( __builtin_add_overflow ) || ( defined( __GNUC__ ) && !defined( __clang__ ) && defined( GCC_VERSION ) && GCC_VERSION >= 50100 )
return __builtin_add_overflow( a, b, &result ); return __builtin_add_overflow( a, b, &result );
#else #else
bool overflow = false; bool overflow = false;
@ -88,7 +92,7 @@ bool rathena::util::safe_addition( int64 a, int64 b, int64& result ){
} }
bool rathena::util::safe_substraction( int64 a, int64 b, int64& result ){ bool rathena::util::safe_substraction( int64 a, int64 b, int64& result ){
#if defined(__GNUC__) || defined(__clang__) #if __has_builtin( __builtin_sub_overflow ) || ( defined( __GNUC__ ) && !defined( __clang__ ) && defined( GCC_VERSION ) && GCC_VERSION >= 50100 )
return __builtin_sub_overflow( a, b, &result ); return __builtin_sub_overflow( a, b, &result );
#else #else
bool overflow = false; bool overflow = false;
@ -110,7 +114,7 @@ bool rathena::util::safe_substraction( int64 a, int64 b, int64& result ){
} }
bool rathena::util::safe_multiplication( int64 a, int64 b, int64& result ){ bool rathena::util::safe_multiplication( int64 a, int64 b, int64& result ){
#if defined(__GNUC__) || defined(__clang__) #if __has_builtin( __builtin_mul_overflow ) || ( defined( __GNUC__ ) && !defined( __clang__ ) && defined( GCC_VERSION ) && GCC_VERSION >= 50100 )
return __builtin_mul_overflow( a, b, &result ); return __builtin_mul_overflow( a, b, &result );
#else #else
result = a * b; result = a * b;