From c2172ee3b56c673c56e3cdd92b78f280493e9564 Mon Sep 17 00:00:00 2001 From: "Rickert, Jonas" Date: Thu, 2 Oct 2025 12:47:04 +0100 Subject: [PATCH] Do not override C++ standard in in-tree built. Also fix an issue preventing building with C++20 --- CMakeLists.txt | 2 +- lib/RefBackend/RefBackend.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c0f940467630..7d2c3aa7e65b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -23,7 +23,7 @@ endif() project(torch-mlir LANGUAGES CXX C) set(CMAKE_C_STANDARD 11) -set(CMAKE_CXX_STANDARD 17) +set(CMAKE_CXX_STANDARD 17 CACHE STRING "C++ standard to use") include(CMakeDependentOption) diff --git a/lib/RefBackend/RefBackend.cpp b/lib/RefBackend/RefBackend.cpp index d40d02d43ffc..cd2413234857 100644 --- a/lib/RefBackend/RefBackend.cpp +++ b/lib/RefBackend/RefBackend.cpp @@ -109,7 +109,7 @@ static std::string getConsumeReturnFunctionNameForReturnTypes(TypeRange types) { tokens.push_back(getTypeToken(type)); return std::accumulate(tokens.begin(), tokens.end(), std::string(), - [](std::string &a, std::string &b) { + [](const std::string &a, const std::string &b) { return a.empty() ? b : (a + "_" + b); }); }