Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions Framework/CurveFitting/src/Functions/BSpline.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -61,14 +61,14 @@ void BSpline::resetValidators() {
auto attStartX = getAttribute("StartX");
auto attEndX = getAttribute("EndX");

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

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

auto breakPointsValidator =
dynamic_cast<ArrayBoundedValidator<double> *>(getAttribute("BreakPoints").getValidator().get());
std::dynamic_pointer_cast<ArrayBoundedValidator<double>>(getAttribute("BreakPoints").getValidator());
breakPointsValidator->setLower(attStartX.asDouble());
breakPointsValidator->setUpper(attEndX.asDouble());
}
Expand Down
1 change: 1 addition & 0 deletions buildconfig/CMake/CommonSetup.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,7 @@ endif()
# ######################################################################################################################
set(CMAKE_CXX_STANDARD 20)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(CMAKE_CXX_EXTENSIONS OFF)

# ######################################################################################################################
# Setup ccache
Expand Down
1 change: 1 addition & 0 deletions buildconfig/CMake/GNUSetup.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ elseif("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
add_definitions(-D_LIBCPP_DISABLE_AVAILABILITY)
# Keep C++14 alignment behaviour while older macOS C++ ABI does not contain the required symbols. Minimum=macos 10.14
add_compile_options(-fno-aligned-new)
add_compile_options(-fno-assume-unique-vtables)
endif()

# Add some options for debug build to help the Zoom profiler
Expand Down
6 changes: 3 additions & 3 deletions conda/recipes/conda_build_config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,17 @@ c_compiler:
- clang # [osx]
- vs2019 # [win]
c_compiler_version: # [unix]
- 16 # [osx]
- 18 # [osx]
- 13 # [linux]
cxx_compiler:
- gxx # [linux]
- clangxx # [osx]
- vs2019 # [win]
cxx_compiler_version: # [unix]
- 16 # [osx]
- 18 # [osx]
- 13 # [linux]
llvm_openmp: # [osx]
- 16 # [osx]
- 18 # [osx]

python:
- 3.10
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +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.
Loading