From f6962b110ed15d5d061c20fc262f3eb3518fbe02 Mon Sep 17 00:00:00 2001
From: Damien Nguyen <damien1@huawei.com>
Date: Thu, 24 Nov 2022 09:48:21 +0100
Subject: [PATCH 1/2] [CXX] Fix compilation issue on macOS with XCode 12.4

---
 ccsrc/include/core/parameter_resolver_external_ops.hpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ccsrc/include/core/parameter_resolver_external_ops.hpp b/ccsrc/include/core/parameter_resolver_external_ops.hpp
index c472d9738..aa8e5abf0 100644
--- a/ccsrc/include/core/parameter_resolver_external_ops.hpp
+++ b/ccsrc/include/core/parameter_resolver_external_ops.hpp
@@ -117,7 +117,7 @@ template <typename lhs_t, typename rhs_t,
           typename = std::enable_if_t<(traits::is_parameter_resolver_v<lhs_t> && traits::is_parameter_resolver_v<rhs_t>)
                                       || (traits::is_parameter_resolver_v<lhs_t> && traits::is_scalar_decay_v<rhs_t>)
                                       || (traits::is_scalar_decay_v<lhs_t> && traits::is_parameter_resolver_v<rhs_t>)>>
-auto operator==(const lhs_t& lhs, const rhs_t& rhs) {
+bool operator==(const lhs_t& lhs, const rhs_t& rhs) {
     return lhs.IsEqual(rhs);
 }
 #endif  // MQ_HAS_CONCEPTS
-- 
Gitee


From 0c5b8c74ff2de1419c3be41e55adb5331f15ef6e Mon Sep 17 00:00:00 2001
From: Damien Nguyen <damien1@huawei.com>
Date: Thu, 24 Nov 2022 10:19:44 +0100
Subject: [PATCH 2/2] [SCRIPT] Fix PowerShell script bug on Windows due to line
 endings handling

---
 scripts/parse_toml.ps1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/parse_toml.ps1 b/scripts/parse_toml.ps1
index a47a1d183..31818dafb 100644
--- a/scripts/parse_toml.ps1
+++ b/scripts/parse_toml.ps1
@@ -31,7 +31,7 @@ function Read-BuildSystemRequires([string]$Path) {
     }
 
     $build_requires = $content.Split(' ') `
-      | ForEach-Object{$_ -replace "'", '' -replace  ',$', '' -replace '\n', '' -replace '"', "'"} `
+      | ForEach-Object{$_ -replace "'|\n|\r", '' -replace  ',$', '' -replace '"', "'"} `
       | Where-Object {$_} | ForEach-Object{ "`"$_`""}
 
     Write-Debug ("  read {0}" -f ($build_requires -Join ' '))
-- 
Gitee