Skip to content

Keep dir_itr_imp::operator new/delete out of line to avoid -Wmismatched-new-delete #357

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

Closed
baumgold wants to merge 1 commit into from
Closed

Keep dir_itr_imp::operator new/delete out of line to avoid -Wmismatched-new-delete #357

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
10 changes: 7 additions & 3 deletions src/directory.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,11 @@ boost::scope::unique_fd openat_directory(int basedir_fd, path const& p, director

BOOST_CONSTEXPR_OR_CONST std::size_t dir_itr_imp_extra_data_alignment = 16u;

BOOST_FILESYSTEM_DECL void* dir_itr_imp::operator new(std::size_t class_size, std::size_t extra_size) noexcept
// The class-specific operator new and operator delete are kept out of line as a pair. If GCC inlines only one of them
// into a caller, it sees malloc paired with free through the new/delete expressions and reports a false
// -Wmismatched-new-delete (an error with -Werror).

BOOST_FILESYSTEM_DECL BOOST_NOINLINE void* dir_itr_imp::operator new(std::size_t class_size, std::size_t extra_size) noexcept
{
if (extra_size > 0)
class_size = (class_size + dir_itr_imp_extra_data_alignment - 1u) & ~(dir_itr_imp_extra_data_alignment - 1u);
Expand All @@ -254,12 +258,12 @@ BOOST_FILESYSTEM_DECL void* dir_itr_imp::operator new(std::size_t class_size, st
return p;
}

BOOST_FILESYSTEM_DECL void dir_itr_imp::operator delete(void* p, std::size_t extra_size) noexcept
BOOST_FILESYSTEM_DECL BOOST_NOINLINE void dir_itr_imp::operator delete(void* p, std::size_t extra_size) noexcept
{
std::free(p);
}

BOOST_FILESYSTEM_DECL void dir_itr_imp::operator delete(void* p) noexcept
BOOST_FILESYSTEM_DECL BOOST_NOINLINE void dir_itr_imp::operator delete(void* p) noexcept
{
std::free(p);
}
Expand Down