Skip to content

Order the arguments of pointer_in_range #171

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Order the arguments of pointer_in_range #171

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions doc/pointer_in_range.qbk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ template<class T, class N>
void
Allocator<T, N>::deallocate(pointer ptr, size_type)
{
if (!boost::pointer_in_range(ptr, buffer_, buffer_ + N)) {
if (!boost::pointer_in_range(buffer_, ptr, buffer_ + N)) {
::operator delete(ptr);
}
}
Expand All @@ -47,16 +47,16 @@ Allocator<T, N>::deallocate(pointer ptr, size_type)
namespace boost {

template<class T>
constexpr bool pointer_in_range(const T* ptr, const T* begin, const T* end);
constexpr bool pointer_in_range(const T* begin, const T* ptr, const T* end);

} /* boost */
```

[section Functions]

[variablelist
[[`template<class T> constexpr bool pointer_in_range(const T* ptr,
const T* begin, T* end);`]
[[`template<class T> constexpr bool pointer_in_range(const T* begin,
const T* ptr, T* end);`]
[[variablelist
[[Requires][`[begin,end)` is a valid range.]]
[[Returns][`true` if `ptr` is in range `[begin,end)`, otherwise `false`.]]]]]]
Expand Down
2 changes: 1 addition & 1 deletion include/boost/core/pointer_in_range.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ namespace boost {

template<class T>
inline BOOST_CONSTEXPR bool
pointer_in_range(const T* p, const T* b, const T* e)
pointer_in_range(const T* b, const T* p, const T* e)
{
#if defined(BOOST_CORE_DETAIL_HAS_IS_CONSTEVAL)
if ( __builtin_is_constant_evaluated()) {
Expand Down
24 changes: 12 additions & 12 deletions test/pointer_in_range_constexpr_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,18 +14,18 @@ int n = 0;
const int b[4] = { 0, 0, 0, 0 };
const int m = 0;

BOOST_STATIC_ASSERT(!boost::pointer_in_range(&a[0], &a[1], a + 4));
BOOST_STATIC_ASSERT(!boost::pointer_in_range(&a[1], &a[0], a + 4));
BOOST_STATIC_ASSERT(boost::pointer_in_range(&a[1], &a[1], a + 4));
BOOST_STATIC_ASSERT(boost::pointer_in_range(&a[2], &a[1], a + 4));
BOOST_STATIC_ASSERT(boost::pointer_in_range(&a[3], &a[1], a + 4));
BOOST_STATIC_ASSERT(!boost::pointer_in_range(a + 4, &a[1], a + 4));
BOOST_STATIC_ASSERT(!boost::pointer_in_range(&n, &a[0], &a[3]));
BOOST_STATIC_ASSERT(!boost::pointer_in_range(&m, &a[0], &a[3]));
BOOST_STATIC_ASSERT(!boost::pointer_in_range(&b[0], &b[1], b + 4));
BOOST_STATIC_ASSERT(boost::pointer_in_range(&a[1], &a[2], a + 4));
BOOST_STATIC_ASSERT(boost::pointer_in_range(&a[1], &a[3], a + 4));
BOOST_STATIC_ASSERT(!boost::pointer_in_range(&a[1], a + 4, a + 4));
BOOST_STATIC_ASSERT(!boost::pointer_in_range(&a[0], &n, &a[3]));
BOOST_STATIC_ASSERT(!boost::pointer_in_range(&a[0], &m, &a[3]));
BOOST_STATIC_ASSERT(!boost::pointer_in_range(&b[1], &b[0], b + 4));
BOOST_STATIC_ASSERT(boost::pointer_in_range(&b[1], &b[1], b + 4));
BOOST_STATIC_ASSERT(boost::pointer_in_range(&b[2], &b[1], b + 4));
BOOST_STATIC_ASSERT(boost::pointer_in_range(&b[3], &b[1], b + 4));
BOOST_STATIC_ASSERT(!boost::pointer_in_range(b + 4, &b[1], b + 4));
BOOST_STATIC_ASSERT(!boost::pointer_in_range(&n, &b[0], &b[3]));
BOOST_STATIC_ASSERT(!boost::pointer_in_range(&m, &b[0], &b[3]));
BOOST_STATIC_ASSERT(boost::pointer_in_range(&b[1], &b[2], b + 4));
BOOST_STATIC_ASSERT(boost::pointer_in_range(&b[1], &b[3], b + 4));
BOOST_STATIC_ASSERT(!boost::pointer_in_range(&b[1], b + 4, b + 4));
BOOST_STATIC_ASSERT(!boost::pointer_in_range(&b[0], &n, &b[3]));
BOOST_STATIC_ASSERT(!boost::pointer_in_range(&b[0], &m, &b[3]));
#endif
24 changes: 12 additions & 12 deletions test/pointer_in_range_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,19 +14,19 @@ int main()
int n = 0;
const int b[4] = { 0, 0, 0, 0 };
const int m = 0;
BOOST_TEST(!boost::pointer_in_range(&a[0], &a[1], a + 4));
BOOST_TEST(!boost::pointer_in_range(&a[1], &a[0], a + 4));
BOOST_TEST(boost::pointer_in_range(&a[1], &a[1], a + 4));
BOOST_TEST(boost::pointer_in_range(&a[2], &a[1], a + 4));
BOOST_TEST(boost::pointer_in_range(&a[3], &a[1], a + 4));
BOOST_TEST(!boost::pointer_in_range(a + 4, &a[1], a + 4));
BOOST_TEST(!boost::pointer_in_range(&n, &a[0], &a[3]));
BOOST_TEST(!boost::pointer_in_range(&m, &a[0], &a[3]));
BOOST_TEST(!boost::pointer_in_range(&b[0], &b[1], b + 4));
BOOST_TEST(boost::pointer_in_range(&a[1], &a[2], a + 4));
BOOST_TEST(boost::pointer_in_range(&a[1], &a[3], a + 4));
BOOST_TEST(!boost::pointer_in_range(&a[1], a + 4, a + 4));
BOOST_TEST(!boost::pointer_in_range(&a[0], &n, &a[3]));
BOOST_TEST(!boost::pointer_in_range(&a[0], &m, &a[3]));
BOOST_TEST(!boost::pointer_in_range(&b[1], &b[0], b + 4));
BOOST_TEST(boost::pointer_in_range(&b[1], &b[1], b + 4));
BOOST_TEST(boost::pointer_in_range(&b[2], &b[1], b + 4));
BOOST_TEST(boost::pointer_in_range(&b[3], &b[1], b + 4));
BOOST_TEST(!boost::pointer_in_range(b + 4, &b[1], b + 4));
BOOST_TEST(!boost::pointer_in_range(&n, &b[0], &b[3]));
BOOST_TEST(!boost::pointer_in_range(&m, &b[0], &b[3]));
BOOST_TEST(boost::pointer_in_range(&b[1], &b[2], b + 4));
BOOST_TEST(boost::pointer_in_range(&b[1], &b[3], b + 4));
BOOST_TEST(!boost::pointer_in_range(&b[1], b + 4, b + 4));
BOOST_TEST(!boost::pointer_in_range(&b[0], &n, &b[3]));
BOOST_TEST(!boost::pointer_in_range(&b[0], &m, &b[3]));
return boost::report_errors();
}