freebsd-ports/databases/mariadb104-server/files/patch-oqgraph-MDEV-15291

40 lines
1.1 KiB
Text

--- storage/oqgraph/oqgraph_judy.cc.orig 2018-02-12 15:01:28 UTC
+++ storage/oqgraph/oqgraph_judy.cc
@@ -27,7 +27,7 @@
/*
Currently the only active code that can return error is:
judy_bitset::reset()/J1U()
- judy_bitset::setbit()/J1S()
+ judy_bitset::jsetbit()/J1S()
In most cases errors are either about wrong parameters passed to Judy
functions or internal structures corruption. These definitely deserve
@@ -60,7 +60,7 @@ bool open_query::judy_bitset::test(size_
return rc == 1;
}
-open_query::judy_bitset& open_query::judy_bitset::setbit(size_type n)
+open_query::judy_bitset& open_query::judy_bitset::jsetbit(size_type n)
{
int rc;
J1S(rc, array, n);
--- storage/oqgraph/oqgraph_judy.h.orig 2018-02-12 15:01:28 UTC
+++ storage/oqgraph/oqgraph_judy.h
@@ -63,7 +63,7 @@ namespace open_query
if (!val)
return reset(n);
else
- return setbit(n);
+ return jsetbit(n);
}
judy_bitset& set(const judy_bitset& src);
@@ -115,7 +115,7 @@ namespace open_query
private:
mutable void* array;
- judy_bitset& setbit(size_type n);
+ judy_bitset& jsetbit(size_type n);
};
}