Skip to content

Commit fb7259f

Browse files
Fix names
1 parent b8c6dc2 commit fb7259f

File tree

1 file changed

+15
-13
lines changed

1 file changed

+15
-13
lines changed

libcxx/include/__stacktrace/basic_stacktrace.h

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -100,17 +100,17 @@ class basic_stacktrace : private __stacktrace::_Trace {
100100

101101
vector<stacktrace_entry, _Allocator> __entries_;
102102

103-
_LIBCPP_HIDE_FROM_ABI _EntryIters entry_iters() { return {__entries_.data(), __entries_.size()}; }
103+
_LIBCPP_HIDE_FROM_ABI _EntryIters __entry_iters() { return {__entries_.data(), __entries_.size()}; }
104104

105-
_LIBCPP_HIDE_FROM_ABI __stacktrace::_Entry& entry_append() {
105+
_LIBCPP_HIDE_FROM_ABI __stacktrace::_Entry& __entry_append() {
106106
return (__stacktrace::_Entry&)__entries_.emplace_back();
107107
}
108108

109-
_LIBCPP_HIDE_FROM_ABI auto entry_iters_fn() {
110-
return [this] -> _EntryIters { return entry_iters(); };
109+
_LIBCPP_HIDE_FROM_ABI auto __entry_iters_fn() {
110+
return [this] -> _EntryIters { return __entry_iters(); };
111111
}
112-
_LIBCPP_HIDE_FROM_ABI auto entry_append_fn() {
113-
return [this] -> __stacktrace::_Entry& { return entry_append(); };
112+
_LIBCPP_HIDE_FROM_ABI auto __entry_append_fn() {
113+
return [this] -> __stacktrace::_Entry& { return __entry_append(); };
114114
}
115115

116116
public:
@@ -132,12 +132,14 @@ class basic_stacktrace : private __stacktrace::_Trace {
132132
// Creation and assignment [stacktrace.basic.cons]
133133

134134
_LIBCPP_ALWAYS_INLINE // Omit this function from the trace
135-
static basic_stacktrace current(const allocator_type& __alloc = allocator_type()) noexcept {
135+
static basic_stacktrace
136+
current(const allocator_type& __alloc = allocator_type()) noexcept {
136137
return current(0, __default_max_depth, __alloc);
137138
}
138139

139140
_LIBCPP_ALWAYS_INLINE // Omit this function from the trace
140-
static basic_stacktrace current(size_type __skip, const allocator_type& __alloc = allocator_type()) noexcept {
141+
static basic_stacktrace
142+
current(size_type __skip, const allocator_type& __alloc = allocator_type()) noexcept {
141143
return current(__skip, __default_max_depth, __alloc);
142144
}
143145

@@ -164,23 +166,23 @@ class basic_stacktrace : private __stacktrace::_Trace {
164166
: basic_stacktrace(allocator_type()) {}
165167

166168
_LIBCPP_HIDE_FROM_ABI explicit basic_stacktrace(const allocator_type& __alloc) noexcept
167-
: _Trace(entry_iters_fn(), entry_append_fn()), __entries_(__alloc) {}
169+
: _Trace(__entry_iters_fn(), __entry_append_fn()), __entries_(__alloc) {}
168170

169171
_LIBCPP_HIDE_FROM_ABI basic_stacktrace(const basic_stacktrace& __other)
170-
: _Trace(entry_iters_fn(), entry_append_fn()) {
172+
: _Trace(__entry_iters_fn(), __entry_append_fn()) {
171173
__entries_ = __other.__entries_;
172174
}
173175

174176
_LIBCPP_HIDE_FROM_ABI basic_stacktrace(basic_stacktrace&& __other) noexcept
175-
: _Trace(entry_iters_fn(), entry_append_fn()) {
177+
: _Trace(__entry_iters_fn(), __entry_append_fn()) {
176178
__entries_ = std::move(__other.__entries_);
177179
}
178180

179181
_LIBCPP_HIDE_FROM_ABI basic_stacktrace(const basic_stacktrace& __other, const allocator_type& __alloc)
180-
: _Trace(entry_iters_fn(), entry_append_fn()), __entries_(__other.__entries_, __alloc) {}
182+
: _Trace(__entry_iters_fn(), __entry_append_fn()), __entries_(__other.__entries_, __alloc) {}
181183

182184
_LIBCPP_HIDE_FROM_ABI basic_stacktrace(basic_stacktrace&& __other, const allocator_type& __alloc)
183-
: _Trace(entry_iters_fn(), entry_append_fn()), __entries_(std::move(__other.__entries_), __alloc) {}
185+
: _Trace(__entry_iters_fn(), __entry_append_fn()), __entries_(std::move(__other.__entries_), __alloc) {}
184186

185187
_LIBCPP_HIDE_FROM_ABI basic_stacktrace& operator=(const basic_stacktrace& __other) {
186188
__entries_ = __other.__entries_;

0 commit comments

Comments
 (0)