dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Suppress Wdeprecated-copy warning in btree_iterator

Browse Source
This commit is contained in:
Jonathan G Rennison
2021-11-09 01:49:48 +00:00
parent 2b8018f5d6
commit a731da3956
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/3rdparty/cpp-btree/btree.h vendored
View File

@@ -724,6 +724,11 @@ class btree_node {
void operator=(const btree_node&); void operator=(const btree_node&);
}; };
#ifndef _MSC_VER
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-copy"
#endif /* _MSC_VER */
template <typename Node, typename Reference, typename Pointer> template <typename Node, typename Reference, typename Pointer>
struct btree_iterator { struct btree_iterator {
typedef typename Node::key_type key_type; typedef typename Node::key_type key_type;
@@ -826,6 +831,10 @@ struct btree_iterator {
int position; int position;
}; };
#ifndef _MSC_VER
#pragma GCC diagnostic pop
#endif /* _MSC_VER */
// Dispatch helper class for using btree::internal_locate with plain compare. // Dispatch helper class for using btree::internal_locate with plain compare.
struct btree_internal_locate_plain_compare { struct btree_internal_locate_plain_compare {
template <typename K, typename T, typename Iter> template <typename K, typename T, typename Iter>