Changeset 161309 in webkit for trunk/Source/JavaScriptCore/parser/Parser.cpp

Timestamp:

Jan 4, 2014, 9:26:52 AM (12 years ago)

Author:

[email protected]

Message:

Explicitly use the std:: nested name specifier when using std::pair, std::make_pair
​https://bugs.webkit.org/show_bug.cgi?id=126439

Reviewed by Andreas Kling.

Source/JavaScriptCore:

Instead of relying on std::pair and std::make_pair symbols being present in the current scope
through the pair and make_pair symbols, the std:: specifier should be used explicitly.

• bytecode/Opcode.cpp:

(JSC::compareOpcodePairIndices):
(JSC::OpcodeStats::~OpcodeStats):

• bytecompiler/BytecodeGenerator.cpp:

(JSC::BytecodeGenerator::BytecodeGenerator):

• parser/ASTBuilder.h:

(JSC::ASTBuilder::makeBinaryNode):

• parser/Parser.cpp:

(JSC::Parser<LexerType>::parseIfStatement):

• runtime/Structure.cpp:

(JSC::StructureTransitionTable::contains):
(JSC::StructureTransitionTable::get):
(JSC::StructureTransitionTable::add):

Source/WebCore:

Instead of relying on std::pair and std::make_pair symbols being present in the current scope
through the pair and make_pair symbols, the std:: specifier should be used explicitly.

• Modules/webdatabase/DatabaseTracker.cpp:

(WebCore::DatabaseTracker::scheduleNotifyDatabaseChanged):

• accessibility/AXObjectCache.h:
• accessibility/AccessibilityARIAGridCell.cpp:

(WebCore::AccessibilityARIAGridCell::rowIndexRange):
(WebCore::AccessibilityARIAGridCell::columnIndexRange):

• accessibility/AccessibilityARIAGridCell.h:
• accessibility/AccessibilityObject.h:
• accessibility/AccessibilityRenderObject.cpp:

(WebCore::AccessibilityRenderObject::mathPrescripts):
(WebCore::AccessibilityRenderObject::mathPostscripts):

• accessibility/AccessibilityTable.cpp:

(WebCore::AccessibilityTable::cellForColumnAndRow):

• accessibility/AccessibilityTableCell.cpp:

(WebCore::AccessibilityTableCell::rowIndexRange):
(WebCore::AccessibilityTableCell::columnIndexRange):

• accessibility/AccessibilityTableCell.h:
• accessibility/atk/WebKitAccessibleInterfaceTable.cpp:

(webkitAccessibleTableGetColumnAtIndex):
(webkitAccessibleTableGetRowAtIndex):
(webkitAccessibleTableGetColumnExtentAt):
(webkitAccessibleTableGetRowExtentAt):
(webkitAccessibleTableGetColumnHeader):
(webkitAccessibleTableGetRowHeader):

• accessibility/ios/WebAccessibilityObjectWrapperIOS.mm:

(-[WebAccessibilityObjectWrapper accessibilityHeaderElements]):
(-[WebAccessibilityObjectWrapper accessibilityRowRange]):
(-[WebAccessibilityObjectWrapper accessibilityColumnRange]):

• accessibility/mac/WebAccessibilityObjectWrapperBase.mm:

(convertMathPairsToNSArray):

• accessibility/mac/WebAccessibilityObjectWrapperMac.mm:

(-[WebAccessibilityObjectWrapper accessibilityAttributeValue:]):

• bindings/js/SerializedScriptValue.cpp:
• dom/ContainerNode.cpp:
• dom/StyledElement.cpp:

(WebCore::attributeNameSort):

• html/MediaFragmentURIParser.cpp:

(WebCore::MediaFragmentURIParser::parseTimeFragment):

• html/parser/HTMLMetaCharsetParser.h:
• inspector/ContentSearchUtils.cpp:

(WebCore::ContentSearchUtils::getRegularExpressionMatchesByLines):
(WebCore::ContentSearchUtils::searchInTextByLines):

• inspector/DOMPatchSupport.cpp:

(WebCore::DOMPatchSupport::diff):
(WebCore::DOMPatchSupport::innerPatchChildren):

• inspector/DOMPatchSupport.h:
• inspector/InspectorAgent.cpp:

(WebCore::InspectorAgent::enable):
(WebCore::InspectorAgent::evaluateForTestInFrontend):

• inspector/InspectorAgent.h:
• loader/FormSubmission.cpp:

(WebCore::FormSubmission::create):

• loader/cache/CachedImage.cpp:

(WebCore::CachedImage::brokenImage):

• loader/cache/CachedImage.h:
• platform/URL.cpp:

(WebCore::findHostnamesInMailToURL):
(WebCore::encodeHostnames):

• platform/blackberry/CookieDatabaseBackingStore/CookieDatabaseBackingStore.h:
• platform/graphics/FontCache.cpp:

(WebCore::FontCache::getCachedFontData):

• platform/graphics/WidthIterator.cpp:
• platform/network/HTTPHeaderMap.cpp:

(WebCore::HTTPHeaderMap::adopt):

• platform/network/ResourceResponseBase.cpp:

(WebCore::ResourceResponseBase::parseCacheControlDirectives):
(WebCore::parseCacheHeader):

• platform/text/AtomicStringKeyedMRUCache.h:
• platform/text/LineBreakIteratorPoolICU.h:
• rendering/InlineFlowBox.h:
• rendering/RenderImage.cpp:

(WebCore::RenderImage::imageSizeForError):
(WebCore::RenderImage::paintReplaced):

• rendering/RenderTableSection.cpp:

(WebCore::RenderTableSection::cachedCollapsedBorder):

• rendering/RenderTableSection.h:
• rendering/svg/SVGTextRunRenderingContext.cpp:

(WebCore::SVGTextRunRenderingContext::glyphDataForCharacter):

• svg/SVGAnimatedAngle.cpp:

(WebCore::SVGAnimatedAngleAnimator::constructFromString):
(WebCore::SVGAnimatedAngleAnimator::addAnimatedTypes):
(WebCore::SVGAnimatedAngleAnimator::calculateAnimatedValue):

• svg/SVGAnimatedIntegerOptionalInteger.cpp:

(WebCore::SVGAnimatedIntegerOptionalIntegerAnimator::constructFromString):
(WebCore::SVGAnimatedIntegerOptionalIntegerAnimator::addAnimatedTypes):
(WebCore::SVGAnimatedIntegerOptionalIntegerAnimator::calculateAnimatedValue):

• svg/SVGAnimatedNumberOptionalNumber.cpp:

(WebCore::SVGAnimatedNumberOptionalNumberAnimator::constructFromString):
(WebCore::SVGAnimatedNumberOptionalNumberAnimator::addAnimatedTypes):
(WebCore::SVGAnimatedNumberOptionalNumberAnimator::calculateAnimatedValue):

• svg/SVGAnimatedType.cpp:

(WebCore::SVGAnimatedType::createIntegerOptionalInteger):
(WebCore::SVGAnimatedType::createNumberOptionalNumber):

• svg/SVGAnimatedType.h:

(WebCore::SVGAnimatedType::integerOptionalInteger):
(WebCore::SVGAnimatedType::numberOptionalNumber):

• svg/SVGAnimatedTypeAnimator.h:

(WebCore::SVGAnimatedTypeAnimator::constructFromBaseValues):
(WebCore::SVGAnimatedTypeAnimator::resetFromBaseValues):

• svg/SVGParserUtilities.h:
• svg/animation/SMILTimeContainer.h:

Source/WebKit/mac:

Instead of relying on std::pair and std::make_pair symbols being present in the current scope
through the pair and make_pair symbols, the std:: specifier should be used explicitly.

• Plugins/Hosted/NetscapePluginInstanceProxy.h:
• Plugins/Hosted/NetscapePluginInstanceProxy.mm:

(WebKit::NetscapePluginInstanceProxy::LocalObjectMap::idForObject):
(WebKit::NetscapePluginInstanceProxy::LocalObjectMap::retain):
(WebKit::NetscapePluginInstanceProxy::LocalObjectMap::release):
(WebKit::NetscapePluginInstanceProxy::LocalObjectMap::forget):

Source/WebKit2:

Instead of relying on std::pair and std::make_pair symbols being present in the current scope
through the pair and make_pair symbols, the std:: specifier should be used explicitly.

• Shared/mac/ArgumentCodersMac.mm:

(IPC::encode):

• UIProcess/Notifications/WebNotificationManagerProxy.cpp:

(WebKit::WebNotificationManagerProxy::show):
(WebKit::WebNotificationManagerProxy::cancel):
(WebKit::WebNotificationManagerProxy::didDestroyNotification):

• UIProcess/Notifications/WebNotificationManagerProxy.h:
• UIProcess/WebContext.cpp:

(WebKit::WebContext::createNewWebProcess):

• UIProcess/WebContext.h:

Source/WTF:

• wtf/VectorTraits.h: Stop bringing std::pair into the current scope.

File:

• trunk/Source/JavaScriptCore/parser/Parser.cpp (modified) (4 diffs)

trunk/Source/JavaScriptCore/parser/Parser.cpp

@@ -1428 +1428 @@
 
     Vector<TreeExpression> exprStack;
-    Vector<pair<int, int>> posStack;
+    Vector<std::pair<int, int>> posStack;
     Vector<JSTokenLocation> tokenLocationStack;
     Vector<TreeStatement> statementStack;
@@ -1457 +1457 @@
         tokenLocationStack.append(tempLocation);
         exprStack.append(innerCondition);
-        posStack.append(make_pair(innerStart, innerEnd));
+        posStack.append(std::make_pair(innerStart, innerEnd));
         statementStack.append(innerTrueBlock);
     } while (match(ELSE));
@@ -1466 +1466 @@
         TreeStatement trueBlock = statementStack.last();
         statementStack.removeLast();
-        pair<int, int> pos = posStack.last();
+        std::pair<int, int> pos = posStack.last();
         posStack.removeLast();
         JSTokenLocation elseLocation = tokenLocationStack.last();
@@ -1480 +1480 @@
         TreeStatement trueBlock = statementStack.last();
         statementStack.removeLast();
-        pair<int, int> pos = posStack.last();
+        std::pair<int, int> pos = posStack.last();
         posStack.removeLast();
         JSTokenLocation elseLocation = tokenLocationStack.last();