@@ -29,7 +29,7 @@ _LIBCPP_CONSTEXPR inline _LIBCPP_HIDE_FROM_ABI bool __is_overaligned_for_new(siz
29
29
#endif
30
30
}
31
31
32
- template <class _Tp , class ... _Args>
32
+ template <class ... _Args>
33
33
_LIBCPP_HIDE_FROM_ABI void * __libcpp_operator_new (_Args... __args) {
34
34
#if __has_builtin(__builtin_operator_new) && __has_builtin(__builtin_operator_delete)
35
35
return __builtin_operator_new (__args...);
@@ -38,7 +38,7 @@ _LIBCPP_HIDE_FROM_ABI void* __libcpp_operator_new(_Args... __args) {
38
38
#endif
39
39
}
40
40
41
- template <class _Tp , class ... _Args>
41
+ template <class ... _Args>
42
42
_LIBCPP_HIDE_FROM_ABI void __libcpp_operator_delete (_Args... __args) _NOEXCEPT {
43
43
#if __has_builtin(__builtin_operator_new) && __has_builtin(__builtin_operator_delete)
44
44
__builtin_operator_delete (__args...);
@@ -52,12 +52,12 @@ inline _LIBCPP_HIDE_FROM_ABI void* __libcpp_allocate(size_t __size, size_t __ali
52
52
#if _LIBCPP_HAS_ALIGNED_ALLOCATION
53
53
if (__is_overaligned_for_new (__align)) {
54
54
const align_val_t __align_val = static_cast <align_val_t >(__align);
55
- return std::__libcpp_operator_new<_Tp> (__size, __align_val);
55
+ return std::__libcpp_operator_new (__size, __align_val);
56
56
}
57
57
#endif
58
58
59
59
(void )__align;
60
- return std::__libcpp_operator_new<_Tp> (__size);
60
+ return std::__libcpp_operator_new (__size);
61
61
}
62
62
63
63
#if _LIBCPP_HAS_SIZED_DEALLOCATION
@@ -71,13 +71,13 @@ inline _LIBCPP_HIDE_FROM_ABI void __libcpp_deallocate(void* __ptr, size_t __size
71
71
(void )__size;
72
72
#if !_LIBCPP_HAS_ALIGNED_ALLOCATION
73
73
(void )__align;
74
- return std::__libcpp_operator_delete<_Tp> (__ptr _LIBCPP_ONLY_IF_SIZED_DEALLOCATION (, __size));
74
+ return std::__libcpp_operator_delete (__ptr _LIBCPP_ONLY_IF_SIZED_DEALLOCATION (, __size));
75
75
#else
76
76
if (__is_overaligned_for_new (__align)) {
77
77
const align_val_t __align_val = static_cast <align_val_t >(__align);
78
- return std::__libcpp_operator_delete<_Tp> (__ptr _LIBCPP_ONLY_IF_SIZED_DEALLOCATION (, __size), __align_val);
78
+ return std::__libcpp_operator_delete (__ptr _LIBCPP_ONLY_IF_SIZED_DEALLOCATION (, __size), __align_val);
79
79
} else {
80
- return std::__libcpp_operator_delete<_Tp> (__ptr _LIBCPP_ONLY_IF_SIZED_DEALLOCATION (, __size));
80
+ return std::__libcpp_operator_delete (__ptr _LIBCPP_ONLY_IF_SIZED_DEALLOCATION (, __size));
81
81
}
82
82
#endif
83
83
}
@@ -95,13 +95,13 @@ template <class _Tp>
95
95
inline _LIBCPP_HIDE_FROM_ABI void __libcpp_deallocate_unsized (void * __ptr, size_t __align) _NOEXCEPT {
96
96
#if !_LIBCPP_HAS_ALIGNED_ALLOCATION
97
97
(void )__align;
98
- return std::__libcpp_operator_delete<_Tp> (__ptr);
98
+ return std::__libcpp_operator_delete (__ptr);
99
99
#else
100
100
if (__is_overaligned_for_new (__align)) {
101
101
const align_val_t __align_val = static_cast <align_val_t >(__align);
102
- return std::__libcpp_operator_delete<_Tp> (__ptr, __align_val);
102
+ return std::__libcpp_operator_delete (__ptr, __align_val);
103
103
} else {
104
- return std::__libcpp_operator_delete<_Tp> (__ptr);
104
+ return std::__libcpp_operator_delete (__ptr);
105
105
}
106
106
#endif
107
107
}
0 commit comments