Title: [144751] trunk/Source/WebCore
- Revision
- 144751
- Author
- [email protected]
- Date
- 2013-03-05 05:29:23 -0800 (Tue, 05 Mar 2013)
Log Message
BUILD FIX (r144727): Change type of columnRange and rowRange to pair<unsigned, unsigned>
<http://webkit.org/b/110050>
Fixes the following build failures:
Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm:741:30: error: non-const lvalue reference to type 'pair<unsigned int, unsigned int>' cannot bind to a value of unrelated type 'pair<int, int>'
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<unsigned, unsigned>& rowRange);
^
Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm:742:33: error: non-const lvalue reference to type 'pair<unsigned int, unsigned int>' cannot bind to a value of unrelated type 'pair<int, int>'
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<unsigned, unsigned>& columnRange);
^
Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm:804:30: error: non-const lvalue reference to type 'pair<unsigned int, unsigned int>' cannot bind to a value of unrelated type 'pair<int, int>'
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<unsigned, unsigned>& rowRange);
^
Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm:818:33: error: non-const lvalue reference to type 'pair<unsigned int, unsigned int>' cannot bind to a value of unrelated type 'pair<int, int>'
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<unsigned, unsigned>& columnRange);
^
4 errors generated.
* accessibility/ios/WebAccessibilityObjectWrapperIOS.mm:
(-[WebAccessibilityObjectWrapper accessibilityHeaderElements]):
(-[WebAccessibilityObjectWrapper accessibilityRowRange]):
(-[WebAccessibilityObjectWrapper accessibilityColumnRange]):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (144750 => 144751)
--- trunk/Source/WebCore/ChangeLog 2013-03-05 12:53:35 UTC (rev 144750)
+++ trunk/Source/WebCore/ChangeLog 2013-03-05 13:29:23 UTC (rev 144751)
@@ -1,3 +1,45 @@
+2013-03-05 David Kilzer <[email protected]>
+
+ BUILD FIX (r144727): Change type of columnRange and rowRange to pair<unsigned, unsigned>
+ <http://webkit.org/b/110050>
+
+ Fixes the following build failures:
+
+ Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm:741:30: error: non-const lvalue reference to type 'pair<unsigned int, unsigned int>' cannot bind to a value of unrelated type 'pair<int, int>'
+ 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<unsigned, unsigned>& rowRange);
+ ^
+ Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm:742:33: error: non-const lvalue reference to type 'pair<unsigned int, unsigned int>' cannot bind to a value of unrelated type 'pair<int, int>'
+ 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<unsigned, unsigned>& columnRange);
+ ^
+ Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm:804:30: error: non-const lvalue reference to type 'pair<unsigned int, unsigned int>' cannot bind to a value of unrelated type 'pair<int, int>'
+ 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<unsigned, unsigned>& rowRange);
+ ^
+ Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm:818:33: error: non-const lvalue reference to type 'pair<unsigned int, unsigned int>' cannot bind to a value of unrelated type 'pair<int, int>'
+ 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<unsigned, unsigned>& columnRange);
+ ^
+ 4 errors generated.
+
+ * accessibility/ios/WebAccessibilityObjectWrapperIOS.mm:
+ (-[WebAccessibilityObjectWrapper accessibilityHeaderElements]):
+ (-[WebAccessibilityObjectWrapper accessibilityRowRange]):
+ (-[WebAccessibilityObjectWrapper accessibilityColumnRange]):
+
2013-03-04 Andrey Kosyakov <[email protected]>
Web Inspector: [refactoring] set frame identifiers in timeline records early, do not keep them in event stack
Modified: trunk/Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm (144750 => 144751)
--- trunk/Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm 2013-03-05 12:53:35 UTC (rev 144750)
+++ trunk/Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm 2013-03-05 13:29:23 UTC (rev 144751)
@@ -736,8 +736,8 @@
return nil;
// Get the row and column range, so we can use them to find the headers.
- pair<int, int> rowRange;
- pair<int, int> columnRange;
+ pair<unsigned, unsigned> rowRange;
+ pair<unsigned, unsigned> columnRange;
tableCell->rowIndexRange(rowRange);
tableCell->columnIndexRange(columnRange);
@@ -800,7 +800,7 @@
if (!tableCell)
return NSMakeRange(NSNotFound, 0);
- pair<int, int> rowRange;
+ pair<unsigned, unsigned> rowRange;
tableCell->rowIndexRange(rowRange);
return NSMakeRange(rowRange.first, rowRange.second);
}
@@ -814,7 +814,7 @@
if (!tableCell)
return NSMakeRange(NSNotFound, 0);
- pair<int, int> columnRange;
+ pair<unsigned, unsigned> columnRange;
tableCell->columnIndexRange(columnRange);
return NSMakeRange(columnRange.first, columnRange.second);
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
