summarylogtreecommitdiffstats
path: root/0004-libstdc-fix-incomplete-type-in-AXTree-for-NodeSetSiz.patch
diff options
context:
space:
mode:
authorDaniel Playfair Cal2020-04-28 00:28:19 +1000
committerDaniel Playfair Cal2020-04-28 00:28:19 +1000
commitf5a7f79e5b7cc11028a5c3e14b9f235d3f7602c5 (patch)
tree75fd21b7a9ef0958d7356631713fda6130abe165 /0004-libstdc-fix-incomplete-type-in-AXTree-for-NodeSetSiz.patch
parent68351964753fbb3a7221b2e9f8b3c42b66e838dd (diff)
downloadaur-f5a7f79e5b7cc11028a5c3e14b9f235d3f7602c5.tar.gz
83.0.4103.23-1
Diffstat (limited to '0004-libstdc-fix-incomplete-type-in-AXTree-for-NodeSetSiz.patch')
-rw-r--r--0004-libstdc-fix-incomplete-type-in-AXTree-for-NodeSetSiz.patch60
1 files changed, 0 insertions, 60 deletions
diff --git a/0004-libstdc-fix-incomplete-type-in-AXTree-for-NodeSetSiz.patch b/0004-libstdc-fix-incomplete-type-in-AXTree-for-NodeSetSiz.patch
deleted file mode 100644
index 7196e285c14..00000000000
--- a/0004-libstdc-fix-incomplete-type-in-AXTree-for-NodeSetSiz.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From ffa47b54c9dbed28a8b1b2b9428049073937b3fe Mon Sep 17 00:00:00 2001
-From: Stephan Hartmann <stha09@googlemail.com>
-Date: Sun, 5 Apr 2020 08:29:21 +0000
-Subject: [PATCH 4/8] libstdc++: fix incomplete-type in AXTree for
- NodeSetSizePosInSetInfo
-
-std::unordered_map<T, U> requires U to be fully declared. ax_tree.h
-has only forward declaration of NodeSetSizePosInSetInfo. Therefore,
-move declaration from ax_tree.cc.
-Bug: 957519
-Change-Id: Ic1f4bf3ebfea229ece84251e46d4461b31873868
----
- ui/accessibility/ax_tree.cc | 10 ++--------
- ui/accessibility/ax_tree.h | 9 ++++++++-
- 2 files changed, 10 insertions(+), 9 deletions(-)
-
-diff --git a/ui/accessibility/ax_tree.cc b/ui/accessibility/ax_tree.cc
-index 7b8d9b1b1610..e9154028d664 100644
---- a/ui/accessibility/ax_tree.cc
-+++ b/ui/accessibility/ax_tree.cc
-@@ -567,14 +567,8 @@ struct AXTreeUpdateState {
- const AXTree& tree;
- };
-
--struct AXTree::NodeSetSizePosInSetInfo {
-- NodeSetSizePosInSetInfo() = default;
-- ~NodeSetSizePosInSetInfo() = default;
--
-- int32_t pos_in_set = 0;
-- int32_t set_size = 0;
-- base::Optional<int> lowest_hierarchical_level;
--};
-+AXTree::NodeSetSizePosInSetInfo::NodeSetSizePosInSetInfo() = default;
-+AXTree::NodeSetSizePosInSetInfo::~NodeSetSizePosInSetInfo() = default;
-
- struct AXTree::OrderedSetContent {
- explicit OrderedSetContent(const AXNode* ordered_set = nullptr)
-diff --git a/ui/accessibility/ax_tree.h b/ui/accessibility/ax_tree.h
-index a51ca8de4c84..8c1c57517ac0 100644
---- a/ui/accessibility/ax_tree.h
-+++ b/ui/accessibility/ax_tree.h
-@@ -328,7 +328,14 @@ class AX_EXPORT AXTree : public AXNode::OwnerTree {
- bool enable_extra_mac_nodes_ = false;
-
- // Contains pos_in_set and set_size data for an AXNode.
-- struct NodeSetSizePosInSetInfo;
-+ struct NodeSetSizePosInSetInfo {
-+ NodeSetSizePosInSetInfo();
-+ ~NodeSetSizePosInSetInfo();
-+
-+ int32_t pos_in_set = 0;
-+ int32_t set_size = 0;
-+ base::Optional<int> lowest_hierarchical_level;
-+ };
-
- // Represents the content of an ordered set which includes the ordered set
- // items and the ordered set container if it exists.
---
-2.26.1
-