| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2005, 2006, 2007, 2008 Apple Inc. All rights reserved. | 2 * Copyright (C) 2005, 2006, 2007, 2008 Apple Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * This library is free software; you can redistribute it and/or | 4 * This library is free software; you can redistribute it and/or |
| 5 * modify it under the terms of the GNU Library General Public | 5 * modify it under the terms of the GNU Library General Public |
| 6 * License as published by the Free Software Foundation; either | 6 * License as published by the Free Software Foundation; either |
| 7 * version 2 of the License, or (at your option) any later version. | 7 * version 2 of the License, or (at your option) any later version. |
| 8 * | 8 * |
| 9 * This library is distributed in the hope that it will be useful, | 9 * This library is distributed in the hope that it will be useful, |
| 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of | 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
| (...skipping 818 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 829 { | 829 { |
| 830 return expandCapacity(newMinCapacity, const_cast<T*>(data)); | 830 return expandCapacity(newMinCapacity, const_cast<T*>(data)); |
| 831 } | 831 } |
| 832 | 832 |
| 833 template <typename U> U* expandCapacity(size_t newMinCapacity, U*); | 833 template <typename U> U* expandCapacity(size_t newMinCapacity, U*); |
| 834 void shrinkCapacity(size_t newCapacity); | 834 void shrinkCapacity(size_t newCapacity); |
| 835 template <typename U> void appendSlowCase(U&&); | 835 template <typename U> void appendSlowCase(U&&); |
| 836 | 836 |
| 837 using Base::m_size; | 837 using Base::m_size; |
| 838 using Base::buffer; | 838 using Base::buffer; |
| 839 using Base::capacity; | |
| 840 using Base::swapVectorBuffer; | 839 using Base::swapVectorBuffer; |
| 841 using Base::allocateBuffer; | 840 using Base::allocateBuffer; |
| 842 using Base::allocationSize; | 841 using Base::allocationSize; |
| 843 }; | 842 }; |
| 844 | 843 |
| 845 template <typename T, size_t inlineCapacity, typename Allocator> | 844 template <typename T, size_t inlineCapacity, typename Allocator> |
| 846 Vector<T, inlineCapacity, Allocator>::Vector(const Vector& other) | 845 Vector<T, inlineCapacity, Allocator>::Vector(const Vector& other) |
| 847 : Base(other.capacity()) | 846 : Base(other.capacity()) |
| 848 { | 847 { |
| 849 ANNOTATE_NEW_BUFFER(begin(), capacity(), other.size()); | 848 ANNOTATE_NEW_BUFFER(begin(), capacity(), other.size()); |
| (...skipping 531 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1381 STATIC_ONLY(NeedsTracing); | 1380 STATIC_ONLY(NeedsTracing); |
| 1382 static const bool value = false; | 1381 static const bool value = false; |
| 1383 }; | 1382 }; |
| 1384 #endif | 1383 #endif |
| 1385 | 1384 |
| 1386 } // namespace WTF | 1385 } // namespace WTF |
| 1387 | 1386 |
| 1388 using WTF::Vector; | 1387 using WTF::Vector; |
| 1389 | 1388 |
| 1390 #endif // WTF_Vector_h | 1389 #endif // WTF_Vector_h |
| OLD | NEW |