diff --git a/ccsrc/include/core/parameter_resolver_external_ops.hpp b/ccsrc/include/core/parameter_resolver_external_ops.hpp index c472d973816d0c1adc209fa2ee46fcb4095e38d3..aa8e5abf03757929fa453982757f7b53fc5b9011 100644 --- a/ccsrc/include/core/parameter_resolver_external_ops.hpp +++ b/ccsrc/include/core/parameter_resolver_external_ops.hpp @@ -117,7 +117,7 @@ template && traits::is_parameter_resolver_v) || (traits::is_parameter_resolver_v && traits::is_scalar_decay_v) || (traits::is_scalar_decay_v && traits::is_parameter_resolver_v)>> -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 diff --git a/scripts/parse_toml.ps1 b/scripts/parse_toml.ps1 index a47a1d183a5f505f5d362d57e8acdc16d770397b..31818dafbd7cdb33a535cc35111f7351b6bfd757 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 ' '))