1*4882a593SmuzhiyunFrom 72e0fe484444169007e481c9b33d8f78ebe03674 Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: Khem Raj <raj.khem@gmail.com> 3*4882a593SmuzhiyunDate: Thu, 27 May 2021 15:44:10 -0700 4*4882a593SmuzhiyunSubject: [PATCH] Fix build with libc++ 5*4882a593Smuzhiyun 6*4882a593SmuzhiyunIn libc++ on 32-bit platforms, int64_t is defined as alias of long long. On 64-bit platforms: long. 7*4882a593Smuzhiyun 8*4882a593SmuzhiyunOn the other hand in definition of std::chrono::duration aliases, that you can find here long long is used 9*4882a593Smuzhiyun 10*4882a593SmuzhiyunTherefore create custom unit to avoid incompatibility between libstdc++ 11*4882a593Smuzhiyunand libc++ 12*4882a593Smuzhiyun 13*4882a593SmuzhiyunUpstream-Status: Pending 14*4882a593Smuzhiyun 15*4882a593SmuzhiyunSigned-off-by: Khem Raj <raj.khem@gmail.com> 16*4882a593Smuzhiyun--- 17*4882a593Smuzhiyun extensions/expression-language/Expression.cpp | 3 ++- 18*4882a593Smuzhiyun 1 file changed, 2 insertions(+), 1 deletion(-) 19*4882a593Smuzhiyun 20*4882a593Smuzhiyundiff --git a/extensions/expression-language/Expression.cpp b/extensions/expression-language/Expression.cpp 21*4882a593Smuzhiyunindex a25e1d3f..68d6320c 100644 22*4882a593Smuzhiyun--- a/extensions/expression-language/Expression.cpp 23*4882a593Smuzhiyun+++ b/extensions/expression-language/Expression.cpp 24*4882a593Smuzhiyun@@ -629,7 +629,8 @@ Value expr_toDate(const std::vector<Value> &args) { 25*4882a593Smuzhiyun #endif // EXPRESSION_LANGUAGE_USE_DATE 26*4882a593Smuzhiyun 27*4882a593Smuzhiyun Value expr_now(const std::vector<Value> &args) { 28*4882a593Smuzhiyun- return Value(std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::system_clock::now().time_since_epoch()).count()); 29*4882a593Smuzhiyun+ using Milliseconds = std::chrono::duration<std::int64_t, std::chrono::milliseconds::period>; 30*4882a593Smuzhiyun+ return Value(std::chrono::duration_cast<Milliseconds>(std::chrono::system_clock::now().time_since_epoch()).count()); 31*4882a593Smuzhiyun } 32*4882a593Smuzhiyun 33*4882a593Smuzhiyun Value expr_unescapeCsv(const std::vector<Value> &args) { 34*4882a593Smuzhiyun-- 35*4882a593Smuzhiyun2.31.1 36*4882a593Smuzhiyun 37