Merge branch 'master' into master-msvc-194-only-lib

This commit is contained in:
Jonas Hoppe
2024-09-10 10:04:14 +02:00
3 changed files with 22 additions and 19 deletions

2
.gitignore vendored
View File

@@ -49,4 +49,4 @@ CMakeUserPresets.json
# cxxdraft-htmlgen # cxxdraft-htmlgen
docs/api_reference/src/source/ docs/api_reference/src/source/
docs/api_reference/gen/ docs/api_reference/gen

View File

@@ -17,3 +17,18 @@ RUN sudo install-packages \
libjpeg-dev \ libjpeg-dev \
libpng-dev \ libpng-dev \
libz-dev libz-dev
# Install API reference dependencies
RUN sudo install-packages \
haskell-stack \
graphviz \
nodejs \
npm \
ghc \
cabal-install
RUN npm install split mathjax-full mathjax-node-sre
RUN cabal update
# Install MathJax-Node-CLI
git clone https://github.com/mathjax/mathjax-node-cli --depth=1
echo "export PATH=\"$PWD/mathjax-node-cli/bin:\$PATH\"" >> ~/.bashrc

View File

@@ -314,25 +314,13 @@ public:
convert_explicitly> || convert_explicitly> ||
!std::convertible_to<Rep, typename quantity_like_traits<Q>::rep>) constexpr !std::convertible_to<Rep, typename quantity_like_traits<Q>::rep>) constexpr
// NOLINTNEXTLINE(google-explicit-constructor, hicpp-explicit-conversions) // NOLINTNEXTLINE(google-explicit-constructor, hicpp-explicit-conversions)
operator Q_() const& noexcept( operator Q_() const
noexcept(quantity_like_traits<Q>::from_numerical_value(numerical_value_is_an_implementation_detail_)) && noexcept(noexcept(quantity_like_traits<Q>::from_numerical_value(numerical_value_is_an_implementation_detail_)) &&
std::is_nothrow_copy_constructible_v<rep>) std::is_nothrow_copy_constructible_v<rep>)
{ {
return quantity_like_traits<Q>::from_numerical_value(numerical_value_is_an_implementation_detail_).value; return quantity_like_traits<Q>::from_numerical_value(
} numerical_value_in(get_unit(quantity_like_traits<Q>::reference)))
.value;
template<typename Q_, QuantityLike Q = std::remove_cvref_t<Q_>>
requires detail::QuantityConvertibleTo<quantity, detail::quantity_like_type<Q>>
[[nodiscard]] explicit(is_specialization_of<decltype(quantity_like_traits<Q>::from_numerical_value(
numerical_value_is_an_implementation_detail_)),
convert_explicitly> ||
!std::convertible_to<Rep, typename quantity_like_traits<Q>::rep>) constexpr
// NOLINTNEXTLINE(google-explicit-constructor, hicpp-explicit-conversions)
operator Q_() && noexcept(
noexcept(quantity_like_traits<Q>::from_numerical_value(numerical_value_is_an_implementation_detail_)) &&
std::is_nothrow_move_constructible_v<rep>)
{
return quantity_like_traits<Q>::from_numerical_value(std::move(numerical_value_is_an_implementation_detail_)).value;
} }
// member unary operators // member unary operators