Skip to content
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

Allow compile with MSVC and Windows headers (#49) #50

Closed
wants to merge 1 commit into from
Closed

Allow compile with MSVC and Windows headers (#49) #50

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
2 changes: 1 addition & 1 deletion include/boost/pool/pool.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -360,7 +360,7 @@ class pool: protected simple_segregated_storage < typename UserAllocator::size_t
size_type max_chunks() const
{ //! Calculated maximum number of memory chunks that can be allocated in a single call by this Pool.
size_type POD_size = integer::static_lcm<sizeof(size_type), sizeof(void *)>::value + sizeof(size_type);
return (std::numeric_limits<size_type>::max() - POD_size) / alloc_size();
return ((std::numeric_limits<size_type>::max)() - POD_size) / alloc_size();
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this a better workaround than the use of BOOST_PREVENT_MACRO_SUBSTITUTION elsewhere in this file?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For example on line 412

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I used the same as line 351

pool/include/boost/pool/pool.hpp

Line 351 in e0db427

size_type s = (std::max)(requested_size, min_alloc_size);

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think in use BOOST_PREVENT_MACRO_SUBSTITUTION but it extends the line length and reduce readability.

Copy link
Contributor

@mclow mclow Sep 5, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I disagree.
The bare parentheses fix the problem, and they're small.
But they give no clue as to why they are there - and that's my concern.

In the future, someone will come along and remove the "redundant" parens.
Hopefully, when that happens, this whole "windows header" thing will be a bad memory.

Copy link

@johanneskopf johanneskopf Sep 26, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would be great if this could be merged. As when compiling a project with boost 1.82 or 1.83 I run into the following warning many times: C4003: not enough arguments for function-like macro invocation 'max' and this seems to be the culprit.

I also found an issue in another boost lib that addresses the same problem this way:
boostorg/beast@24a1196
Issue it fixed: boostorg/beast#1980.
Would it help to add a comment to explicitly state why those parentheses are there?

}

static void * & nextof(void * const ptr)
Expand Down
1 change: 1 addition & 0 deletions test/Jamfile.v2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ test-suite pool :
[ run test_bug_6701.cpp ]
[ run test_threading.cpp : : : <threading>multi <library>/boost/thread//boost_thread ]
[ compile test_poisoned_macros.cpp ]
[ compile test_issue_49.cpp ]
;

if [ os.environ VALGRIND_OPTS ]
Expand Down
19 changes: 19 additions & 0 deletions test/test_issue_49.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
/* Copyright (C) 2022 Joel Pelaez Jorge
*
* Use, modification and distribution is subject to the
* Boost Software License, Version 1.0. (See accompanying
* file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt)
*/

// Test of issue #49 (https://github.com/boostorg/pool/issues/49)

#if defined (_WIN32)
# include <Windows.h>
#endif
#include <boost/pool/pool.hpp>

int main()
{
boost::pool<> p(1024);
return 0;
}