From df0de99e59bd2408a3cc761bc93aa99dc547dde2 Mon Sep 17 00:00:00 2001 From: "ddkilzer@apple.com" Date: Tue, 5 Mar 2013 13:29:23 +0000 Subject: [PATCH] BUILD FIX (r144727): Change type of columnRange and rowRange to pair Fixes the following build failures: Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm:741:30: error: non-const lvalue reference to type 'pair' cannot bind to a value of unrelated type 'pair' tableCell->rowIndexRange(rowRange); ^~~~~~~~ In file included from Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm:33: Source/WebCore/accessibility/AccessibilityTableCell.h:47:58: note: passing argument to parameter 'rowRange' here virtual void rowIndexRange(pair& rowRange); ^ Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm:742:33: error: non-const lvalue reference to type 'pair' cannot bind to a value of unrelated type 'pair' tableCell->columnIndexRange(columnRange); ^~~~~~~~~~~ In file included from Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm:33: Source/WebCore/accessibility/AccessibilityTableCell.h:49:61: note: passing argument to parameter 'columnRange' here virtual void columnIndexRange(pair& columnRange); ^ Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm:804:30: error: non-const lvalue reference to type 'pair' cannot bind to a value of unrelated type 'pair' tableCell->rowIndexRange(rowRange); ^~~~~~~~ In file included from Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm:33: Source/WebCore/accessibility/AccessibilityTableCell.h:47:58: note: passing argument to parameter 'rowRange' here virtual void rowIndexRange(pair& rowRange); ^ Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm:818:33: error: non-const lvalue reference to type 'pair' cannot bind to a value of unrelated type 'pair' tableCell->columnIndexRange(columnRange); ^~~~~~~~~~~ In file included from Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm:33: Source/WebCore/accessibility/AccessibilityTableCell.h:49:61: note: passing argument to parameter 'columnRange' here virtual void columnIndexRange(pair& columnRange); ^ 4 errors generated. * accessibility/ios/WebAccessibilityObjectWrapperIOS.mm: (-[WebAccessibilityObjectWrapper accessibilityHeaderElements]): (-[WebAccessibilityObjectWrapper accessibilityRowRange]): (-[WebAccessibilityObjectWrapper accessibilityColumnRange]): git-svn-id: https://svn.webkit.org/repository/webkit/trunk@144751 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- Source/WebCore/ChangeLog | 42 +++++++++++++++++++ .../ios/WebAccessibilityObjectWrapperIOS.mm | 8 ++-- 2 files changed, 46 insertions(+), 4 deletions(-) diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog index 05a25341dbbb..bbb86397cf27 100644 --- a/Source/WebCore/ChangeLog +++ b/Source/WebCore/ChangeLog @@ -1,3 +1,45 @@ +2013-03-05 David Kilzer + + BUILD FIX (r144727): Change type of columnRange and rowRange to pair + + + Fixes the following build failures: + + Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm:741:30: error: non-const lvalue reference to type 'pair' cannot bind to a value of unrelated type 'pair' + tableCell->rowIndexRange(rowRange); + ^~~~~~~~ + In file included from Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm:33: + Source/WebCore/accessibility/AccessibilityTableCell.h:47:58: note: passing argument to parameter 'rowRange' here + virtual void rowIndexRange(pair& rowRange); + ^ + Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm:742:33: error: non-const lvalue reference to type 'pair' cannot bind to a value of unrelated type 'pair' + tableCell->columnIndexRange(columnRange); + ^~~~~~~~~~~ + In file included from Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm:33: + Source/WebCore/accessibility/AccessibilityTableCell.h:49:61: note: passing argument to parameter 'columnRange' here + virtual void columnIndexRange(pair& columnRange); + ^ + Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm:804:30: error: non-const lvalue reference to type 'pair' cannot bind to a value of unrelated type 'pair' + tableCell->rowIndexRange(rowRange); + ^~~~~~~~ + In file included from Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm:33: + Source/WebCore/accessibility/AccessibilityTableCell.h:47:58: note: passing argument to parameter 'rowRange' here + virtual void rowIndexRange(pair& rowRange); + ^ + Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm:818:33: error: non-const lvalue reference to type 'pair' cannot bind to a value of unrelated type 'pair' + tableCell->columnIndexRange(columnRange); + ^~~~~~~~~~~ + In file included from Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm:33: + Source/WebCore/accessibility/AccessibilityTableCell.h:49:61: note: passing argument to parameter 'columnRange' here + virtual void columnIndexRange(pair& columnRange); + ^ + 4 errors generated. + + * accessibility/ios/WebAccessibilityObjectWrapperIOS.mm: + (-[WebAccessibilityObjectWrapper accessibilityHeaderElements]): + (-[WebAccessibilityObjectWrapper accessibilityRowRange]): + (-[WebAccessibilityObjectWrapper accessibilityColumnRange]): + 2013-03-04 Andrey Kosyakov Web Inspector: [refactoring] set frame identifiers in timeline records early, do not keep them in event stack diff --git a/Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm b/Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm index 6034e0f0f365..5c944a9d3cb9 100644 --- a/Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm +++ b/Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm @@ -736,8 +736,8 @@ static AccessibilityObjectWrapper* AccessibilityUnignoredAncestor(AccessibilityO return nil; // Get the row and column range, so we can use them to find the headers. - pair rowRange; - pair columnRange; + pair rowRange; + pair columnRange; tableCell->rowIndexRange(rowRange); tableCell->columnIndexRange(columnRange); @@ -800,7 +800,7 @@ static AccessibilityObjectWrapper* AccessibilityUnignoredAncestor(AccessibilityO if (!tableCell) return NSMakeRange(NSNotFound, 0); - pair rowRange; + pair rowRange; tableCell->rowIndexRange(rowRange); return NSMakeRange(rowRange.first, rowRange.second); } @@ -814,7 +814,7 @@ static AccessibilityObjectWrapper* AccessibilityUnignoredAncestor(AccessibilityO if (!tableCell) return NSMakeRange(NSNotFound, 0); - pair columnRange; + pair columnRange; tableCell->columnIndexRange(columnRange); return NSMakeRange(columnRange.first, columnRange.second); } -- 2.36.0