From 7eccef78a9a4dadff9dc11ddd66ca272f5ff9803 Mon Sep 17 00:00:00 2001
From: Mateusz Pusz <mateusz.pusz@gmail.com>
Date: Mon, 29 Jun 2020 20:28:10 +0200
Subject: [PATCH] `is_instantiation` renamed to `is_instantiation_of`

---
 src/include/units/bits/external/type_traits.h | 14 +++++++-------
 src/include/units/physical/dimensions.h       |  4 ++--
 src/include/units/quantity_cast.h             |  4 ++--
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/include/units/bits/external/type_traits.h b/src/include/units/bits/external/type_traits.h
index 1254175e..400f3eb6 100644
--- a/src/include/units/bits/external/type_traits.h
+++ b/src/include/units/bits/external/type_traits.h
@@ -46,25 +46,25 @@ struct conditional_impl<true> {
 template<bool B, typename T, typename F>
 using conditional = detail::conditional_impl<B>::template type<T, F>;
 
-// is_instantiation
+// is_instantiation_of
 namespace detail {
 
 template<typename T, template<typename...> typename Type>
-inline constexpr bool is_instantiation_impl = false;
+inline constexpr bool is_instantiation_of_impl = false;
 
 template<typename... Params, template<typename...> typename Type>
-inline constexpr bool is_instantiation_impl<Type<Params...>, Type> = true;
+inline constexpr bool is_instantiation_of_impl<Type<Params...>, Type> = true;
 
 }  // namespace detail
 
 template<typename T, template<typename...> typename Type>
-inline constexpr bool is_instantiation = detail::is_instantiation_impl<T, Type>;
+inline constexpr bool is_instantiation_of = detail::is_instantiation_of_impl<T, Type>;
 
-// is_derived_from_instantiation
+// is_derived_from_instantiation_of
 namespace detail {
 
 template<template<typename...> typename Type>
-struct is_derived_from_instantiation_impl {
+struct is_derived_from_instantiation_of_impl {
   template<typename... Params>
   static constexpr std::true_type check_base(const Type<Params...>&);
   static constexpr std::false_type check_base(...);
@@ -73,6 +73,6 @@ struct is_derived_from_instantiation_impl {
 }  // namespace detail
 
 template<typename T, template<typename...> typename Type>
-inline constexpr bool is_derived_from_instantiation = decltype(detail::is_derived_from_instantiation_impl<Type>::check_base(std::declval<T>()))::value;
+inline constexpr bool is_derived_from_instantiation_of = decltype(detail::is_derived_from_instantiation_of_impl<Type>::check_base(std::declval<T>()))::value;
 
 }  // namespace units
diff --git a/src/include/units/physical/dimensions.h b/src/include/units/physical/dimensions.h
index cf6692a0..95ac5c44 100644
--- a/src/include/units/physical/dimensions.h
+++ b/src/include/units/physical/dimensions.h
@@ -30,10 +30,10 @@
 namespace units::physical {
 
 template<typename Dim, template<typename...> typename DimTemplate>
-concept DimensionOf = Dimension<Dim> && is_derived_from_instantiation<Dim, DimTemplate>;
+concept DimensionOf = Dimension<Dim> && is_derived_from_instantiation_of<Dim, DimTemplate>;
 
 template<typename Q, template<typename...> typename DimTemplate>
-concept QuantityOf = Quantity<Q> && is_derived_from_instantiation<typename Q::dimension, DimTemplate>;
+concept QuantityOf = Quantity<Q> && is_derived_from_instantiation_of<typename Q::dimension, DimTemplate>;
 
 // ------------------------ base dimensions -----------------------------
 
diff --git a/src/include/units/quantity_cast.h b/src/include/units/quantity_cast.h
index 8ee1bea9..2d4281b1 100644
--- a/src/include/units/quantity_cast.h
+++ b/src/include/units/quantity_cast.h
@@ -403,10 +403,10 @@ template<Scalar ToRep, typename D, typename U, typename Rep>
  */
 template<typename CastSpec, typename D, typename U, typename Rep>
 [[nodiscard]] constexpr auto quantity_point_cast(const quantity_point<D, U, Rep>& qp)
-  requires is_instantiation<CastSpec, quantity_point> ||
+  requires is_instantiation_of<CastSpec, quantity_point> ||
            requires(quantity<D, U, Rep> q) { quantity_cast<CastSpec>(q); }
 {
-  if constexpr (is_instantiation<CastSpec, quantity_point>)
+  if constexpr (is_instantiation_of<CastSpec, quantity_point>)
     return quantity_point(quantity_cast<typename CastSpec::quantity_type>(qp.relative()));
   else
     return quantity_point(quantity_cast<CastSpec>(qp.relative()));