Skip to content

Commit d3bc524

Browse files
authored
Merge pull request #1328 from J-Meyers/python-typing-none-fix
Rename TBoundingBox None Ctor flag
2 parents 9ecdc49 + ec6ba9a commit d3bc524

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

libs/math/include/mrpt/math/TBoundingBox.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ struct TBoundingBox_
2828
{
2929
enum class CTOR_FLAGS
3030
{
31-
None = 0,
31+
NoFlags = 0,
3232
AllowUnordered
3333
};
3434

@@ -43,7 +43,7 @@ struct TBoundingBox_
4343
TBoundingBox_(
4444
const mrpt::math::TPoint3D_<T>& Min,
4545
const mrpt::math::TPoint3D_<T>& Max,
46-
const CTOR_FLAGS f = CTOR_FLAGS::None) :
46+
const CTOR_FLAGS f = CTOR_FLAGS::NoFlags) :
4747
min(Min), max(Max)
4848
{
4949
if (f != CTOR_FLAGS::AllowUnordered)

python/src/mrpt/math/TBoundingBox.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ void bind_mrpt_math_TBoundingBox(std::function< pybind11::module &(std::string c
4444
cl.def( pybind11::init( [](mrpt::math::TBoundingBox_<double> const &o){ return new mrpt::math::TBoundingBox_<double>(o); } ) );
4545

4646
pybind11::enum_<mrpt::math::TBoundingBox_<double>::CTOR_FLAGS>(cl, "CTOR_FLAGS", "")
47-
.value("None", mrpt::math::TBoundingBox_<double>::CTOR_FLAGS::None)
47+
.value("NoFlags", mrpt::math::TBoundingBox_<double>::CTOR_FLAGS::NoFlags)
4848
.value("AllowUnordered", mrpt::math::TBoundingBox_<double>::CTOR_FLAGS::AllowUnordered);
4949

5050
cl.def_readwrite("min", &mrpt::math::TBoundingBox_<double>::min);
@@ -70,7 +70,7 @@ void bind_mrpt_math_TBoundingBox(std::function< pybind11::module &(std::string c
7070
cl.def( pybind11::init( [](mrpt::math::TBoundingBox_<float> const &o){ return new mrpt::math::TBoundingBox_<float>(o); } ) );
7171

7272
pybind11::enum_<mrpt::math::TBoundingBox_<float>::CTOR_FLAGS>(cl, "CTOR_FLAGS", "")
73-
.value("None", mrpt::math::TBoundingBox_<float>::CTOR_FLAGS::None)
73+
.value("NoFlags", mrpt::math::TBoundingBox_<float>::CTOR_FLAGS::NoFlags)
7474
.value("AllowUnordered", mrpt::math::TBoundingBox_<float>::CTOR_FLAGS::AllowUnordered);
7575

7676
cl.def_readwrite("min", &mrpt::math::TBoundingBox_<float>::min);

python/stubs-out/mrpt/pymrpt/mrpt/math.pyi

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1692,7 +1692,7 @@ class TBoundingBox_double_t:
16921692
__doc__: ClassVar[str] = ... # read-only
16931693
__members__: ClassVar[dict] = ... # read-only
16941694
AllowUnordered: ClassVar[TBoundingBox_double_t.CTOR_FLAGS] = ...
1695-
None: ClassVar[TBoundingBox_double_t.CTOR_FLAGS] = ...
1695+
NoFlags: ClassVar[TBoundingBox_double_t.CTOR_FLAGS] = ...
16961696
__entries: ClassVar[dict] = ...
16971697
def __init__(self, value: int) -> None: ...
16981698
def __eq__(self, other: object) -> bool: ...
@@ -1743,7 +1743,7 @@ class TBoundingBox_float_t:
17431743
__doc__: ClassVar[str] = ... # read-only
17441744
__members__: ClassVar[dict] = ... # read-only
17451745
AllowUnordered: ClassVar[TBoundingBox_float_t.CTOR_FLAGS] = ...
1746-
None: ClassVar[TBoundingBox_float_t.CTOR_FLAGS] = ...
1746+
NoFlags: ClassVar[TBoundingBox_float_t.CTOR_FLAGS] = ...
17471747
__entries: ClassVar[dict] = ...
17481748
def __init__(self, value: int) -> None: ...
17491749
def __eq__(self, other: object) -> bool: ...

0 commit comments

Comments
 (0)