Modified: trunk/Source/_javascript_Core/bytecode/ArrayProfile.h (185638 => 185639)
--- trunk/Source/_javascript_Core/bytecode/ArrayProfile.h 2015-06-17 05:11:49 UTC (rev 185638)
+++ trunk/Source/_javascript_Core/bytecode/ArrayProfile.h 2015-06-17 05:18:21 UTC (rev 185639)
@@ -247,7 +247,7 @@
ArrayModes m_observedArrayModes;
};
-typedef SegmentedVector<ArrayProfile, 4, 0> ArrayProfileVector;
+typedef SegmentedVector<ArrayProfile, 4> ArrayProfileVector;
} // namespace JSC
Modified: trunk/Source/_javascript_Core/dfg/DFGCommonData.h (185638 => 185639)
--- trunk/Source/_javascript_Core/dfg/DFGCommonData.h 2015-06-17 05:11:49 UTC (rev 185638)
+++ trunk/Source/_javascript_Core/dfg/DFGCommonData.h 2015-06-17 05:18:21 UTC (rev 185639)
@@ -94,7 +94,7 @@
Vector<WeakReferenceTransition> transitions;
Vector<WriteBarrier<JSCell>> weakReferences;
Vector<WriteBarrier<Structure>> weakStructureReferences;
- SegmentedVector<CodeBlockJettisoningWatchpoint, 1, 0> watchpoints;
+ SegmentedVector<CodeBlockJettisoningWatchpoint, 1> watchpoints;
Vector<JumpReplacement> jumpReplacements;
RefPtr<Profiler::Compilation> compilation;
Modified: trunk/Source/WTF/wtf/SegmentedVector.h (185638 => 185639)
--- trunk/Source/WTF/wtf/SegmentedVector.h 2015-06-17 05:11:49 UTC (rev 185638)
+++ trunk/Source/WTF/wtf/SegmentedVector.h 2015-06-17 05:18:21 UTC (rev 185639)
@@ -35,12 +35,12 @@
namespace WTF {
// An iterator for SegmentedVector. It supports only the pre ++ operator
- template <typename T, size_t SegmentSize = 8, size_t InlineCapacity = 32> class SegmentedVector;
- template <typename T, size_t SegmentSize = 8, size_t InlineCapacity = 32> class SegmentedVectorIterator {
+ template <typename T, size_t SegmentSize = 8> class SegmentedVector;
+ template <typename T, size_t SegmentSize = 8> class SegmentedVectorIterator {
private:
- friend class SegmentedVector<T, SegmentSize, InlineCapacity>;
+ friend class SegmentedVector<T, SegmentSize>;
public:
- typedef SegmentedVectorIterator<T, SegmentSize, InlineCapacity> Iterator;
+ typedef SegmentedVectorIterator<T, SegmentSize> Iterator;
~SegmentedVectorIterator() { }
@@ -76,7 +76,7 @@
return m_index != other.m_index || m_segment != other.m_segment || &m_vector != &other.m_vector;
}
- SegmentedVectorIterator& operator=(const SegmentedVectorIterator<T, SegmentSize, InlineCapacity>& other)
+ SegmentedVectorIterator& operator=(const SegmentedVectorIterator<T, SegmentSize>& other)
{
m_vector = other.m_vector;
m_segment = other.m_segment;
@@ -85,14 +85,14 @@
}
private:
- SegmentedVectorIterator(SegmentedVector<T, SegmentSize, InlineCapacity>& vector, size_t segment, size_t index)
+ SegmentedVectorIterator(SegmentedVector<T, SegmentSize>& vector, size_t segment, size_t index)
: m_vector(vector)
, m_segment(segment)
, m_index(index)
{
}
- SegmentedVector<T, SegmentSize, InlineCapacity>& m_vector;
+ SegmentedVector<T, SegmentSize>& m_vector;
size_t m_segment;
size_t m_index;
};
@@ -101,14 +101,14 @@
// stored in its buffer when it grows. Therefore, it is safe to keep
// pointers into a SegmentedVector. The default tuning values are
// optimized for segmented vectors that get large; you may want to use
- // SegmentedVector<thingy, 1, 0> if you don't expect a lot of entries.
- template <typename T, size_t SegmentSize, size_t InlineCapacity>
+ // SegmentedVector<thingy, 1> if you don't expect a lot of entries.
+ template <typename T, size_t SegmentSize>
class SegmentedVector {
- friend class SegmentedVectorIterator<T, SegmentSize, InlineCapacity>;
+ friend class SegmentedVectorIterator<T, SegmentSize>;
WTF_MAKE_NONCOPYABLE(SegmentedVector);
public:
- typedef SegmentedVectorIterator<T, SegmentSize, InlineCapacity> Iterator;
+ typedef SegmentedVectorIterator<T, SegmentSize> Iterator;
SegmentedVector()
: m_size(0)
@@ -130,7 +130,7 @@
const T& at(size_t index) const
{
- return const_cast<SegmentedVector<T, SegmentSize, InlineCapacity>*>(this)->at(index);
+ return const_cast<SegmentedVector<T, SegmentSize>*>(this)->at(index);
}
T& operator[](size_t index)
