aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorLi Jin <dragon-fly@qq.com>2026-07-24 17:20:10 +0800
committerLi Jin <dragon-fly@qq.com>2026-07-24 17:20:10 +0800
commit7aa3ed1f19748cfaf6c528819741be2107d412e0 (patch)
tree5b5536d78f9262257f7316725e32b50abc3325a8 /src
parent676da10a45af912d9226dce4cb447bf7bd923da0 (diff)
downloadyuescript-7aa3ed1f19748cfaf6c528819741be2107d412e0.tar.gz
yuescript-7aa3ed1f19748cfaf6c528819741be2107d412e0.tar.bz2
yuescript-7aa3ed1f19748cfaf6c528819741be2107d412e0.zip
Fix MSVC inline storage name conflict
Diffstat (limited to 'src')
-rw-r--r--src/yuescript/ast.hpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/yuescript/ast.hpp b/src/yuescript/ast.hpp
index 1985b84..b81df98 100644
--- a/src/yuescript/ast.hpp
+++ b/src/yuescript/ast.hpp
@@ -204,7 +204,7 @@ public:
204 _overflow.reserve(size); 204 _overflow.reserve(size);
205 } else { 205 } else {
206 _overflow.reserve(size); 206 _overflow.reserve(size);
207 for (size_t i = 0; i < _size; i++) _overflow.push_back(_inline[i]); 207 for (size_t i = 0; i < _size; i++) _overflow.push_back(_inlineStorage[i]);
208 _heap = true; 208 _heap = true;
209 } 209 }
210 } 210 }
@@ -213,7 +213,7 @@ public:
213 if (_heap) { 213 if (_heap) {
214 _overflow.push_back(member); 214 _overflow.push_back(member);
215 } else if (_size < InlineCapacity) { 215 } else if (_size < InlineCapacity) {
216 _inline[_size] = member; 216 _inlineStorage[_size] = member;
217 } else { 217 } else {
218 reserve(_size + 1); 218 reserve(_size + 1);
219 _overflow.push_back(member); 219 _overflow.push_back(member);
@@ -221,9 +221,9 @@ public:
221 _size++; 221 _size++;
222 } 222 }
223 223
224 iterator begin() { return _heap ? _overflow.data() : _inline.data(); } 224 iterator begin() { return _heap ? _overflow.data() : _inlineStorage.data(); }
225 iterator end() { return begin() + _size; } 225 iterator end() { return begin() + _size; }
226 const_iterator begin() const { return _heap ? _overflow.data() : _inline.data(); } 226 const_iterator begin() const { return _heap ? _overflow.data() : _inlineStorage.data(); }
227 const_iterator end() const { return begin() + _size; } 227 const_iterator end() const { return begin() + _size; }
228 reverse_iterator rbegin() { return reverse_iterator(end()); } 228 reverse_iterator rbegin() { return reverse_iterator(end()); }
229 reverse_iterator rend() { return reverse_iterator(begin()); } 229 reverse_iterator rend() { return reverse_iterator(begin()); }
@@ -232,7 +232,7 @@ public:
232 232
233private: 233private:
234 static constexpr size_t InlineCapacity = 3; 234 static constexpr size_t InlineCapacity = 3;
235 std::array<ast_member*, InlineCapacity> _inline{}; 235 std::array<ast_member*, InlineCapacity> _inlineStorage{};
236 std::vector<ast_member*> _overflow; 236 std::vector<ast_member*> _overflow;
237 size_t _size = 0; 237 size_t _size = 0;
238 bool _heap = false; 238 bool _heap = false;