Skip to content

remove redundant copy operation. fix warning which can be interpreted as an error in some projects #3486

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 7 commits into from
Nov 22, 2021
Merged

remove redundant copy operation. fix warning which can be interpreted as an error in some projects #3486

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
804b69a
fix compiler warning: deprecated implicit copy constructor
Lishen1 Nov 19, 2021
f1a91a8
Merge branch 'fix compiler warning: deprecated implicit copy construc…
Lishen1 Nov 19, 2021
d2a5f99
Merge branch 'master' of github.com:Lishen1/pybind11
Lishen1 Nov 19, 2021
e40ab51
take care of the bug http://eigen.tuxfamily.org/bz/show_bug.cgi?id=747
Lishen1 Nov 22, 2021
50be0c5
add parenthesis for better reading
Lishen1 Nov 22, 2021
c1cf9d3
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Nov 22, 2021
42159ff
Update include/pybind11/eigen.h
henryiii Nov 22, 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
14 changes: 6 additions & 8 deletions include/pybind11/eigen.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,14 +80,12 @@ template <bool EigenRowMajor> struct EigenConformable {
// Matrix type:
EigenConformable(EigenIndex r, EigenIndex c,
EigenIndex rstride, EigenIndex cstride) :
conformable{true}, rows{r}, cols{c} {
// TODO: when Eigen bug #747 is fixed, remove the tests for non-negativity. http://eigen.tuxfamily.org/bz/show_bug.cgi?id=747
if (rstride < 0 || cstride < 0) {
negativestrides = true;
} else {
stride = {EigenRowMajor ? rstride : cstride /* outer stride */,
EigenRowMajor ? cstride : rstride /* inner stride */ };
}
conformable{true}, rows{r}, cols{c},
//TODO: when Eigen bug #747 is fixed, remove the tests for non-negativity. http://eigen.tuxfamily.org/bz/show_bug.cgi?id=747
stride{EigenRowMajor ? (rstride > 0 ? rstride : 0) : (cstride > 0 ? cstride : 0) /* outer stride */,
EigenRowMajor ? (cstride > 0 ? cstride : 0) : (rstride > 0 ? rstride : 0) /* inner stride */ },
negativestrides{rstride < 0 || cstride < 0} {

}
// Vector type:
EigenConformable(EigenIndex r, EigenIndex c, EigenIndex stride)
Expand Down