Skip to content

Upgrade to CXX20 #11423

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mitchute wants to merge 9 commits into
base: develop
Choose a base branch
from
Open

Upgrade to CXX20 #11423

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
17e6c17
qualify all format statements to use EnergyPlus::format, this is redu…
mitchute Feb 18, 2026
bd870fd
transition to cxx20, fix issues needed to clarify use of EnergyPlus::…
mitchute Feb 18, 2026
9d1519f
migrate some Boilers.cc format strings over to std::format
mitchute Feb 18, 2026
f31e2d7
patch eigen and fmt for CXX20 on MacOS, qualify other remaining forma…
mitchute Feb 19, 2026
0702a0a
ensure CXX20 set project wide
mitchute Feb 19, 2026
e5bdb55
patch fmt for MSVC
mitchute Feb 19, 2026
19f24e2
update macos_dev_target, time to retire support for intel-based mac?
mitchute Feb 19, 2026
eada619
qualify format_to
mitchute Feb 19, 2026
602ab1b
don't convert to std::format in Boilers for now
mitchute Feb 19, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/test_pull_requests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
matrix:
include:
- os: macos-14
macos_dev_target: 13.0
macos_dev_target: 14.0
arch: arm64
python-arch: arm64
run_regressions: true
Expand Down
10 changes: 7 additions & 3 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,15 @@ set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake" ${CMAKE_MODULE_PATH})
set(CMAKE_POSITION_INDEPENDENT_CODE ON)
set(CMAKE_CXX_VISIBILITY_PRESET hidden)

# Project-wide default C++ language level (individual third-party targets may lower/raise as needed)
set(CMAKE_CXX_STANDARD 20)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(CMAKE_CXX_EXTENSIONS OFF)

set_property(GLOBAL PROPERTY USE_FOLDERS ON)

add_library(project_options INTERFACE)
target_compile_features(project_options INTERFACE cxx_std_17)
target_compile_features(project_options INTERFACE cxx_std_20)

add_library(cpp_pch_files INTERFACE)
option(ENABLE_PCH "Enable Precompiled Headers" ON)
Expand Down Expand Up @@ -287,7 +292,6 @@ add_subdirectory(third_party)

target_include_directories(project_options INTERFACE ${PROJECT_SOURCE_DIR}/src)
target_include_directories(project_options INTERFACE ${PROJECT_SOURCE_DIR}/third_party)
target_include_directories(project_options INTERFACE ${PROJECT_SOURCE_DIR}/third_party/fmt-8.0.1/include)
target_include_directories(project_options INTERFACE ${PROJECT_SOURCE_DIR}/third_party/btwxt/include)
target_include_directories(project_options INTERFACE ${PROJECT_SOURCE_DIR}/third_party/re2)
target_include_directories(project_options INTERFACE ${PROJECT_SOURCE_DIR}/third_party/doj)
Expand All @@ -298,7 +302,7 @@ target_include_directories(project_options INTERFACE ${PROJECT_SOURCE_DIR}/third
target_include_directories(project_options SYSTEM INTERFACE ${PROJECT_SOURCE_DIR}/third_party/SQLite/)
target_include_directories(project_options SYSTEM INTERFACE "${PROJECT_SOURCE_DIR}/third_party/Expat" "${PROJECT_SOURCE_DIR}/third_party/Expat/lib")
target_include_directories(project_options INTERFACE ${PROJECT_SOURCE_DIR}/third_party/CLI/)
target_include_directories(project_options INTERFACE ${PROJECT_SOURCE_DIR}/third_party/eigen/)
target_include_directories(project_options SYSTEM INTERFACE ${PROJECT_SOURCE_DIR}/third_party/eigen/)
target_include_directories(project_options INTERFACE ${PROJECT_SOURCE_DIR}/third_party/Windows-CalcEngine/src/Chromogenics/include)
target_include_directories(project_options INTERFACE ${PROJECT_SOURCE_DIR}/third_party/Windows-CalcEngine/src/Common/include)
target_include_directories(project_options INTERFACE ${PROJECT_SOURCE_DIR}/third_party/Windows-CalcEngine/src/Gases/include)
Expand Down
146 changes: 81 additions & 65 deletions src/EnergyPlus/AirLoopHVACDOAS.cc
View file
Open in desktop

Large diffs are not rendered by default.

22 changes: 12 additions & 10 deletions src/EnergyPlus/AirflowNetwork/src/Properties.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,21 +91,23 @@ namespace AirflowNetwork {
if (lowerLimitErrIdx == 0) {
ShowWarningMessage(m_state, "Air temperature below lower limit of -20C for conductivity calculation");
}
ShowRecurringWarningErrorAtEnd(m_state,
format("Air temperature below lower limit of -20C for conductivity calculation. Air temperature of {:.1R} "
"used for conductivity calculation.",
LowerLimit),
lowerLimitErrIdx);
ShowRecurringWarningErrorAtEnd(
m_state,
EnergyPlus::format("Air temperature below lower limit of -20C for conductivity calculation. Air temperature of {:.1R} "
"used for conductivity calculation.",
LowerLimit),
lowerLimitErrIdx);
T = LowerLimit;
} else if (T > UpperLimit) {
if (upperLimitErrIdx == 0) {
ShowWarningMessage(m_state, "Air temperature above upper limit of 70C for conductivity calculation");
}
ShowRecurringWarningErrorAtEnd(m_state,
format("Air temperature above upper limit of 70C for conductivity calculation. Air temperature of {:.1R} "
"used for conductivity calculation.",
UpperLimit),
upperLimitErrIdx);
ShowRecurringWarningErrorAtEnd(
m_state,
EnergyPlus::format("Air temperature above upper limit of 70C for conductivity calculation. Air temperature of {:.1R} "
"used for conductivity calculation.",
UpperLimit),
upperLimitErrIdx);
T = UpperLimit;
}

Expand Down
Loading
Loading