From 776c91cf64f1357505f19316faa947e536350ee7 Mon Sep 17 00:00:00 2001
From: Mateusz Pusz <mateusz.pusz@gmail.com>
Date: Mon, 14 Jan 2019 19:54:19 +0100
Subject: [PATCH] Compilation issues fixed

---
 README.md                     | 6 +++---
 src/include/units/dimension.h | 6 +++---
 src/include/units/quantity.h  | 4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/README.md b/README.md
index f4c3b068..145c60b3 100644
--- a/README.md
+++ b/README.md
@@ -149,7 +149,7 @@ struct dimension_multiply;
 
 template<Exponent... E1, Exponent... E2>
 struct dimension_multiply<dimension<E1...>, dimension<E2...>> {
-  using type = upcasting_traits_t<merge_dimension_t<E1..., E2...>>;
+  using type = upcasting_traits_t<merge_dimension_t<dimension<E1...>, dimension<E2...>>>;
 };
 
 template<Dimension D1, Dimension D2>
@@ -159,9 +159,9 @@ using dimension_multiply_t = typename dimension_multiply<typename D1::base_type,
 Example implementation of `merge_dimension` may look like:
 
 ```cpp
-template<Exponent... Es>
+template<Dimension D1, Dimension D2>
 struct merge_dimension {
-  using type = mp::type_list_sort_t<detail::dim_consolidate_t<mp::type_list_merge_sorted_t<dimension<Es...>, exp_dim_id_less>>, exp_greater_equal>;
+  using type = mp::type_list_sort_t<detail::dim_consolidate_t<mp::type_list_merge_sorted_t<D1, D2, exp_dim_id_less>>, exp_greater_equal>;
 };
 ```
 
diff --git a/src/include/units/dimension.h b/src/include/units/dimension.h
index 52dc6221..89f0178e 100644
--- a/src/include/units/dimension.h
+++ b/src/include/units/dimension.h
@@ -162,9 +162,9 @@ namespace units {
   template<Exponent... Es>
   using make_dimension_t = typename make_dimension<Es...>::type;
 
-  template<Exponent... Es>
+  template<Dimension D1, Dimension D2>
   struct merge_dimension {
-    using type = mp::type_list_sort_t<detail::dim_consolidate_t<mp::type_list_merge_sorted_t<dimension<Es...>, exp_dim_id_less>>, exp_greater_equal>;
+    using type = mp::type_list_sort_t<detail::dim_consolidate_t<mp::type_list_merge_sorted_t<D1, D2, exp_dim_id_less>>, exp_greater_equal>;
   };
 
   template<Exponent... Es>
@@ -176,7 +176,7 @@ namespace units {
   struct dimension_multiply;
 
   template<Exponent... E1, Exponent... E2>
-  struct dimension_multiply<dimension<E1...>, dimension<E2...>> : std::type_identity<upcasting_traits_t<merge_dimension_t<E1..., E2...>>> {};
+  struct dimension_multiply<dimension<E1...>, dimension<E2...>> : std::type_identity<upcasting_traits_t<merge_dimension_t<dimension<E1...>, dimension<E2...>>>> {};
 
   template<Dimension D1, Dimension D2>
   using dimension_multiply_t = typename dimension_multiply<typename D1::base_type, typename D2::base_type>::type;
diff --git a/src/include/units/quantity.h b/src/include/units/quantity.h
index 49f972b4..0280fff1 100644
--- a/src/include/units/quantity.h
+++ b/src/include/units/quantity.h
@@ -245,7 +245,7 @@ namespace units {
 
   template<Dimension D1, Unit U1, Number Rep1, Dimension D2, Unit U2, Number Rep2>
       requires treat_as_floating_point<std::common_type_t<Rep1, Rep2>> || std::ratio_multiply<typename U1::ratio, typename U2::ratio>::den == 1
-  [[nodiscard]] quantity<dimension_multiply_t<D1, D2>, upcasting_traits_t<unit<dimension_multiply_t<D1, D2>,
+  /* [[nodiscard]] */ quantity<dimension_multiply_t<D1, D2>, upcasting_traits_t<unit<dimension_multiply_t<D1, D2>,
                                                                           std::ratio_multiply<typename U1::ratio, typename U2::ratio>>>,
                                                                           std::common_type_t<Rep1, Rep2>>
   constexpr operator*(const quantity<D1, U1, Rep1>& lhs,
@@ -287,7 +287,7 @@ namespace units {
 
   template<Dimension D1, Unit U1, Number Rep1, Dimension D2, Unit U2, Number Rep2>
       requires treat_as_floating_point<std::common_type_t<Rep1, Rep2>> || std::ratio_divide<typename U1::ratio, typename U2::ratio>::den == 1
-  [[nodiscard]] quantity<dimension_divide_t<D1, D2>, upcasting_traits_t<unit<dimension_divide_t<D1, D2>, std::ratio_divide<typename U1::ratio, typename U2::ratio>>>, std::common_type_t<Rep1, Rep2>>
+  /* [[nodiscard]] */ quantity<dimension_divide_t<D1, D2>, upcasting_traits_t<unit<dimension_divide_t<D1, D2>, std::ratio_divide<typename U1::ratio, typename U2::ratio>>>, std::common_type_t<Rep1, Rep2>>
   constexpr operator/(const quantity<D1, U1, Rep1>& lhs,
                       const quantity<D2, U2, Rep2>& rhs)
   {