Skip to content

[smart_holder] clang-tidy fixes (related to recent clang-tidy changes on master). #3053

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

Merged
merged 2 commits into from
Jun 21, 2021
Merged

[smart_holder] clang-tidy fixes (related to recent clang-tidy changes on master). #3053

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a4558c3
clang-tidy fixes (related to recent clang-tidy changes on master).
rwgk Jun 21, 2021
aa4cfa3
More clang-tidy fixes.
rwgk Jun 21, 2021
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 .github/workflows/format.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,4 +44,4 @@ jobs:
-DCMAKE_CXX_STANDARD=17

- name: Build
run: cmake --build build -j 2
run: cmake --build build -j 2 -- --keep-going
Copy link
Collaborator

Choose a reason for hiding this comment

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

Thanks. It was indeed super annoying to not get all the clang-tidy errors.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

@Skylion007 Do you prefer to adopt this in your PR #3051, or do you think it's better if I open a mini PR to add this to master?

Copy link
Collaborator

Choose a reason for hiding this comment

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

Adopting

8 changes: 4 additions & 4 deletions include/pybind11/detail/smart_holder_poc.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ struct smart_holder {
vptr_is_external_shared_ptr{false}, is_populated{false}, is_disowned{false},
pointee_depends_on_holder_owner{false} {}

bool has_pointee() const { return vptr.get() != nullptr; }
bool has_pointee() const { return vptr != nullptr; }

template <typename T>
static void ensure_pointee_is_destructible(const char *context) {
Expand Down Expand Up @@ -180,7 +180,7 @@ struct smart_holder {
}

void ensure_use_count_1(const char *context) const {
if (vptr.get() == nullptr) {
if (vptr == nullptr) {
throw std::invalid_argument(std::string("Cannot disown nullptr (") + context + ").");
}
// In multithreaded environments accessing use_count can lead to
Expand All @@ -194,7 +194,7 @@ struct smart_holder {
}
}

void reset_vptr_deleter_armed_flag(bool armed_flag) {
void reset_vptr_deleter_armed_flag(bool armed_flag) const {
auto vptr_del_ptr = std::get_deleter<guarded_delete>(vptr);
if (vptr_del_ptr == nullptr) {
throw std::runtime_error(
Expand Down Expand Up @@ -259,7 +259,7 @@ struct smart_holder {
void release_disowned() { vptr.reset(); }

// SMART_HOLDER_WIP: review this function.
void ensure_can_release_ownership(const char *context = "ensure_can_release_ownership") {
void ensure_can_release_ownership(const char *context = "ensure_can_release_ownership") const {
ensure_is_not_disowned(context);
ensure_vptr_is_using_builtin_delete(context);
ensure_use_count_1(context);
Expand Down
2 changes: 1 addition & 1 deletion tests/test_class_sh_basic.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ struct uconsumer { // unique_ptr consumer
void pass_rref(std::unique_ptr<atyp> &&obj) { held = std::move(obj); }
std::unique_ptr<atyp> rtrn_valu() { return std::move(held); }
std::unique_ptr<atyp> &rtrn_lref() { return held; }
const std::unique_ptr<atyp> &rtrn_cref() { return held; }
const std::unique_ptr<atyp> &rtrn_cref() const { return held; }
};

// clang-format off
Expand Down
4 changes: 2 additions & 2 deletions tests/test_class_sh_disowning_mi.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,13 @@ void disown_b(std::unique_ptr<B>) {}
// test_multiple_inheritance_python
struct Base1 {
Base1(int i) : i(i) {}
int foo() { return i; }
int foo() const { return i; }
int i;
};

struct Base2 {
Base2(int j) : j(j) {}
int bar() { return j; }
int bar() const { return j; }
int j;
};

Expand Down
2 changes: 1 addition & 1 deletion tests/test_class_sh_trampoline_shared_ptr_cpp_arg.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ struct PySpBase : SpBase {
};

struct SpBaseTester {
std::shared_ptr<SpBase> get_object() { return m_obj; }
std::shared_ptr<SpBase> get_object() const { return m_obj; }
void set_object(std::shared_ptr<SpBase> obj) { m_obj = obj; }
bool is_base_used() { return m_obj->is_base_used(); }
bool has_instance() { return (bool)m_obj; }
Expand Down