From 7aa3ed1f19748cfaf6c528819741be2107d412e0 Mon Sep 17 00:00:00 2001 From: Li Jin Date: Fri, 24 Jul 2026 17:20:10 +0800 Subject: Fix MSVC inline storage name conflict --- src/yuescript/ast.hpp | 10 +++++----- 1 file 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: _overflow.reserve(size); } else { _overflow.reserve(size); - for (size_t i = 0; i < _size; i++) _overflow.push_back(_inline[i]); + for (size_t i = 0; i < _size; i++) _overflow.push_back(_inlineStorage[i]); _heap = true; } } @@ -213,7 +213,7 @@ public: if (_heap) { _overflow.push_back(member); } else if (_size < InlineCapacity) { - _inline[_size] = member; + _inlineStorage[_size] = member; } else { reserve(_size + 1); _overflow.push_back(member); @@ -221,9 +221,9 @@ public: _size++; } - iterator begin() { return _heap ? _overflow.data() : _inline.data(); } + iterator begin() { return _heap ? _overflow.data() : _inlineStorage.data(); } iterator end() { return begin() + _size; } - const_iterator begin() const { return _heap ? _overflow.data() : _inline.data(); } + const_iterator begin() const { return _heap ? _overflow.data() : _inlineStorage.data(); } const_iterator end() const { return begin() + _size; } reverse_iterator rbegin() { return reverse_iterator(end()); } reverse_iterator rend() { return reverse_iterator(begin()); } @@ -232,7 +232,7 @@ public: private: static constexpr size_t InlineCapacity = 3; - std::array _inline{}; + std::array _inlineStorage{}; std::vector _overflow; size_t _size = 0; bool _heap = false; -- cgit v1.2.3-55-g6feb