Changeset 131659 in webkit for trunk/Source/JavaScriptCore/yarr

Timestamp:

Oct 17, 2012, 3:51:10 PM (13 years ago)

Author:

[email protected]

Message:

Clean up Vector.h
​https://bugs.webkit.org/show_bug.cgi?id=99622

Reviewed by Benjamin Poulain.

Source/JavaScriptCore:

Fix fallout from removing std::max and std::min using declarations.

• runtime/StringPrototype.cpp:

(JSC::jsSpliceSubstrings):
(JSC::jsSpliceSubstringsWithSeparators):
(JSC::stringProtoFuncIndexOf):

• yarr/YarrPattern.cpp:

(JSC::Yarr::YarrPatternConstructor::setupDisjunctionOffsets):

Source/WebCore:

Fix fallout from removing std::max and std::min using declarations.

• loader/cache/CachedResource.cpp:

(WebCore::CachedResource::currentAge):

Source/WTF:

Remove unused member functions from Vector and get rid of the std::max and std::min using declarations
(as per the WebKit coding style guidelines).

• WTF.xcodeproj/project.pbxproj:

Turns out StreamBuffer.h was never added to the Xcode project; add it. Also go ahead and sort the project file.

• wtf/Deque.h:

(WTF::::expandCapacity):

• wtf/StreamBuffer.h:

(WTF::StreamBuffer::append):
Add std:: prefixes to max and min.

• wtf/Vector.h:

Remove VectorBase::bufferSlot(), VectorReverseProxy and add std:: prefixes where needed.

Tools:

Remove ReversedProxy test.

• TestWebKitAPI/Tests/WTF/Vector.cpp:

File:

• trunk/Source/JavaScriptCore/yarr/YarrPattern.cpp (modified) (1 diff)

trunk/Source/JavaScriptCore/yarr/YarrPattern.cpp

@@ -658 +658 @@
             PatternAlternative* alternative = disjunction->m_alternatives[alt];
             unsigned currentAlternativeCallFrameSize = setupAlternativeOffsets(alternative, initialCallFrameSize, initialInputPosition);
-            minimumInputSize = min(minimumInputSize, alternative->m_minimumSize);
-            maximumCallFrameSize = max(maximumCallFrameSize, currentAlternativeCallFrameSize);
+            minimumInputSize = std::min(minimumInputSize, alternative->m_minimumSize);
+            maximumCallFrameSize = std::max(maximumCallFrameSize, currentAlternativeCallFrameSize);
             hasFixedSize &= alternative->m_hasFixedSize;
         }