Skip to content

Commit dddaed5

Browse files
committed
fix C++ headers
1 parent 02b5662 commit dddaed5

File tree

4 files changed

+7
-7
lines changed

4 files changed

+7
-7
lines changed

include/mir/rcarray.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ struct mir_rcarray
2424
private:
2525

2626
T* _payload = nullptr;
27-
using U = typename std::remove_all_extents<T>::type;
27+
using U = typename std::remove_const<T>::type;
2828

2929
void _cpp_copy_constructor(const mir_rcarray& rhs) noexcept;
3030
mir_rcarray& _cpp_assign(const mir_rcarray& rhs) noexcept;

include/mir/rcptr.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ struct mir_rcptr
8989

9090
T* _payload = nullptr;
9191
mir_rc_context* _context = nullptr;
92-
using U = typename std::remove_all_extents<T>::type;
92+
using U = typename std::remove_const<T>::type;
9393

9494
public:
9595

@@ -205,7 +205,7 @@ struct mir_rcptr<T* const>
205205

206206
T* _payload = nullptr;
207207
mir_rc_context* _context = nullptr;
208-
using U = typename std::remove_all_extents<T>::type;
208+
using U = typename std::remove_const<T>::type;
209209
static constexpr void (*destr)(U&) = std::is_destructible<T>::value ? &mir::Destructor<U>::destroy : nullptr;
210210
static constexpr mir::type_info_g<U> typeInfoT = {destr, sizeof(T)};
211211

@@ -322,7 +322,7 @@ struct mir_rcptr<T*>
322322

323323
T* _payload = nullptr;
324324
mir_rc_context* _context = nullptr;
325-
using U = typename std::remove_all_extents<T>::type;
325+
using U = typename std::remove_const<T>::type;
326326
static constexpr void (*destr)(U&) = std::is_destructible<T>::value ? &mir::Destructor<U>::destroy : nullptr;
327327
static constexpr mir::type_info_g<U> typeInfoT = {destr, sizeof(T)};
328328

include/mir/series.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ struct mir_series
3333
/// Data / Value type aliases
3434
using Data = typename std::remove_reference<decltype(_data._iterator[0])>::type;
3535

36-
using UnqualIndex = typename std::remove_all_extents<Index>::type;
37-
using UnqualData = typename std::remove_all_extents<Data>::type;
36+
using UnqualIndex = typename std::remove_const<Index>::type;
37+
using UnqualData = typename std::remove_const<Data>::type;
3838

3939
using Observation = std::pair<Index, Data>;
4040
// using ConstObservation = std::pair<const Index, const Data>;

include/mir/slim_rcptr.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ struct mir_slim_rcptr
1111
private:
1212

1313
T* _payload = nullptr;
14-
using U = typename std::remove_all_extents<T>::type;
14+
using U = typename std::remove_const<T>::type;
1515

1616
public:
1717

0 commit comments

Comments
 (0)