External/pugixml
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix BorlandC compilation

Browse Source 
Rename partition to partition3 to resolve conflicts with std::partition.
This commit is contained in:
Arseny Kapoulkine 2017-06-16 00:32:01 -07:00
parent bd23216420
commit b6995f06b9
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/pugixml.cpp
View File

@ -7262,7 +7262,7 @@ PUGI__NS_BEGIN
return middle;
}
template <typename T, typename Pred> void partition(T* begin, T* end, T pivot, const Pred& pred, T** out_eqbeg, T** out_eqend)
template <typename T, typename Pred> void partition3(T* begin, T* end, T pivot, const Pred& pred, T** out_eqbeg, T** out_eqend)
{
// invariant: array is split into 4 groups: = < ? > (each variable denotes the boundary between the groups)
T* eq = begin;
@ -7300,7 +7300,7 @@ PUGI__NS_BEGIN
// partition in three chunks (< = >)
I eqbeg, eqend;
partition(begin, end, *median, pred, &eqbeg, &eqend);
partition3(begin, end, *median, pred, &eqbeg, &eqend);
// loop on larger half
if (eqbeg - begin > end - eqend)

2
tests/test_xpath_functions.cpp
View File

@ -809,7 +809,7 @@ TEST(xpath_unknown_functions)
query[0] = ch;
CHECK_XPATH_FAIL(query);
query[0] = ch - 32;
query[0] = char_t(ch - 32);
CHECK_XPATH_FAIL(query);
}
}