Changeset bd72f517 for libcfa/prelude/prelude-gen.cc

Timestamp:

May 13, 2025, 1:17:50 PM (4 months ago)

Author:

Mike Brooks <mlbrooks@…>

Branches:

master

Children:

0528d79

Parents:

7d02d35 (diff), 2410424 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

File:

• libcfa/prelude/prelude-gen.cc (modified) (1 diff)

libcfa/prelude/prelude-gen.cc

@@ -149 +149 @@
 }
 
-template <typename... T>
-constexpr auto make_array(T&&... values) ->
-    std::array<
-        typename std::decay<typename std::common_type<T...>::type>::type,
-        sizeof...(T)>
-{
-    return std::array<
-        typename std::decay<
-            typename std::common_type<T...>::type>::type,
-        sizeof...(T)>{{std::forward<T>(values)...}};
+template<typename... T>
+using make_array_t = std::array<std::decay_t<std::common_type_t<T...>>, sizeof...(T)>;
+
+template<typename... T>
+constexpr make_array_t<T...> make_array(T&&... values) {
+        return make_array_t<T...>{{std::forward<T>(values)...}};
 }