Skip to content

[smart_holder] Auto select return value policy for clif_automatic #4381

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 9 commits into from
Dec 5, 2022
Merged

[smart_holder] Auto select return value policy for clif_automatic #4381

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
5b7d08e
Auto select return value policy for clif_automatic
wangxf123456 Dec 2, 2022
d1b36c9
Try fixing test failures
wangxf123456 Dec 2, 2022
b7f2e9f
Merge branch 'smart_holder' into apply-clif-automatic
wangxf123456 Dec 5, 2022
5b7bd24
Add more tests.
wangxf123456 Dec 5, 2022
8f992dd
remove comments
wangxf123456 Dec 5, 2022
853c556
Fix test failures
wangxf123456 Dec 5, 2022
74a9e7a
Fix test failures
wangxf123456 Dec 5, 2022
5f310ab
Fix test failure for windows platform
wangxf123456 Dec 5, 2022
2e3c2b7
Fix clangtidy
wangxf123456 Dec 5, 2022
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: 8 additions & 2 deletions tests/test_return_value_policy_override.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,9 @@ struct obj {
struct nocopy {
std::string mtxt;
nocopy(const std::string &mtxt_) : mtxt(mtxt_) {}
Copy link
Collaborator

Choose a reason for hiding this comment

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

Don't you still need to delete the copy ctor?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Thanks for pointing this out. I forgot this. I deleted the copy ctor.

nocopy(const nocopy &) = delete;
nocopy(nocopy &&other) { mtxt = other.mtxt + "_MvCtor"; }
nocopy &operator=(const nocopy &) = delete;
nocopy &operator=(nocopy &&other) {
mtxt = other.mtxt + "_MvCtor";
return *this;
Expand All @@ -51,9 +53,13 @@ const obj &return_const_reference() {
return value;
}

std::shared_ptr<obj> return_shared_pointer() { return std::make_shared<obj>("shared_pointer"); }
std::shared_ptr<obj> return_shared_pointer() {
return std::shared_ptr<obj>(new obj("shared_pointer"));
Copy link
Collaborator

Choose a reason for hiding this comment

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

Should be std::make_shared, right?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Initially I used std::make_shared and std::make_unqiue, but then I see errors note: ‘std::make_unique’ is only available from C++14 onwards, so I modified both of them. I should be able to use std::make_shared with C++11. I will update the PR.

}

std::unique_ptr<obj> return_unique_pointer() { return std::make_unique<obj>("unique_pointer"); }
std::unique_ptr<obj> return_unique_pointer() {
return std::unique_ptr<obj>(new obj("unique_pointer"));
}

nocopy &return_reference_nocopy() {
static nocopy value("reference_nocopy");
Expand Down