Skip to content

Commit 72dbe87

Browse files
Merge pull request #38342 from mantidproject/38335_clang_18
Update Clang to version 18 on macOS
2 parents cd5c613 + e3f9781 commit 72dbe87

File tree

5 files changed

+9
-6
lines changed

5 files changed

+9
-6
lines changed

Framework/CurveFitting/src/Functions/BSpline.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,14 +61,14 @@ void BSpline::resetValidators() {
6161
auto attStartX = getAttribute("StartX");
6262
auto attEndX = getAttribute("EndX");
6363

64-
auto startXValidator = dynamic_cast<BoundedValidator<double> *>(attStartX.getValidator().get());
64+
auto startXValidator = std::dynamic_pointer_cast<BoundedValidator<double>>(attStartX.getValidator());
6565
startXValidator->setUpper(attEndX.asDouble());
6666

67-
auto endXValidator = dynamic_cast<BoundedValidator<double> *>(attEndX.getValidator().get());
67+
auto endXValidator = std::dynamic_pointer_cast<BoundedValidator<double>>(attEndX.getValidator());
6868
endXValidator->setLower(attStartX.asDouble());
6969

7070
auto breakPointsValidator =
71-
dynamic_cast<ArrayBoundedValidator<double> *>(getAttribute("BreakPoints").getValidator().get());
71+
std::dynamic_pointer_cast<ArrayBoundedValidator<double>>(getAttribute("BreakPoints").getValidator());
7272
breakPointsValidator->setLower(attStartX.asDouble());
7373
breakPointsValidator->setUpper(attEndX.asDouble());
7474
}

buildconfig/CMake/CommonSetup.cmake

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,7 @@ endif()
130130
# ######################################################################################################################
131131
set(CMAKE_CXX_STANDARD 20)
132132
set(CMAKE_CXX_STANDARD_REQUIRED ON)
133+
set(CMAKE_CXX_EXTENSIONS OFF)
133134

134135
# ######################################################################################################################
135136
# Setup ccache

buildconfig/CMake/GNUSetup.cmake

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ elseif("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
7272
add_definitions(-D_LIBCPP_DISABLE_AVAILABILITY)
7373
# Keep C++14 alignment behaviour while older macOS C++ ABI does not contain the required symbols. Minimum=macos 10.14
7474
add_compile_options(-fno-aligned-new)
75+
add_compile_options(-fno-assume-unique-vtables)
7576
endif()
7677

7778
# Add some options for debug build to help the Zoom profiler

conda/recipes/conda_build_config.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,17 @@ c_compiler:
55
- clang # [osx]
66
- vs2019 # [win]
77
c_compiler_version: # [unix]
8-
- 16 # [osx]
8+
- 18 # [osx]
99
- 13 # [linux]
1010
cxx_compiler:
1111
- gxx # [linux]
1212
- clangxx # [osx]
1313
- vs2019 # [win]
1414
cxx_compiler_version: # [unix]
15-
- 16 # [osx]
15+
- 18 # [osx]
1616
- 13 # [linux]
1717
llvm_openmp: # [osx]
18-
- 16 # [osx]
18+
- 18 # [osx]
1919

2020
python:
2121
- 3.10
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
- Updated compiler on macOS from version 16 to version 18, which should result in performance improvements. See https://releases.llvm.org for release notes.

0 commit comments

Comments
 (0)