Skip to content

Commit

Permalink
style: clang-tidy: modernize-use-equals-default
Browse files Browse the repository at this point in the history
  • Loading branch information
henryiii committed Sep 15, 2020
1 parent b342c37 commit b491b46
Show file tree
Hide file tree
Showing 10 changed files with 17 additions and 15 deletions.
1 change: 1 addition & 0 deletions .clang-tidy
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ llvm-namespace-comment,
modernize-use-override,
readability-container-size-empty,
modernize-use-using,
modernize-use-equals-default,
'

HeaderFilterRegex: 'pybind11/.*h'
5 changes: 3 additions & 2 deletions include/pybind11/attr.h
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,9 @@ struct sibling { handle value; sibling(const handle &value) : value(value.ptr())

/// Annotation indicating that a class derives from another given type
template <typename T> struct base {

PYBIND11_DEPRECATED("base<T>() was deprecated in favor of specifying 'T' as a template argument to class_")
base() { }
base() { } // NOLINT(modernize-use-equals-default): breaks MSVC 2015 when adding an attribute
};

/// Keep patient alive while nurse lives
Expand All @@ -61,7 +62,7 @@ struct metaclass {
handle value;

PYBIND11_DEPRECATED("py::metaclass() is no longer required. It's turned on by default now.")
metaclass() {}
metaclass() { } // NOLINT(modernize-use-equals-default): breaks MSVC 2015 when adding an attribute

/// Override pybind11's default metaclass
explicit metaclass(handle value) : value(value) { }
Expand Down
2 changes: 1 addition & 1 deletion include/pybind11/buffer_info.h
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ struct buffer_info {
std::vector<ssize_t> strides; // Number of bytes between adjacent entries (for each per dimension)
bool readonly = false; // flag to indicate if the underlying storage may be written to

buffer_info() { }
buffer_info() = default;

buffer_info(void *ptr, ssize_t itemsize, const std::string &format, ssize_t ndim,
detail::any_container<ssize_t> shape_in, detail::any_container<ssize_t> strides_in, bool readonly=false)
Expand Down
2 changes: 1 addition & 1 deletion include/pybind11/cast.h
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@ struct value_and_holder {
{}

// Default constructor (used to signal a value-and-holder not found by get_value_and_holder())
value_and_holder() {}
value_and_holder() = default;

// Used for past-the-end iterator
value_and_holder(size_t index) : index{index} {}
Expand Down
2 changes: 1 addition & 1 deletion include/pybind11/detail/common.h
Original file line number Diff line number Diff line change
Expand Up @@ -761,7 +761,7 @@ struct nodelete { template <typename T> void operator()(T*) { } };
PYBIND11_NAMESPACE_BEGIN(detail)
template <typename... Args>
struct overload_cast_impl {
constexpr overload_cast_impl() {} // MSVC 2015 needs this
constexpr overload_cast_impl() {}; // NOLINT(modernize-use-equals-default): MSVC 2015 needs this

template <typename Return>
constexpr auto operator()(Return (*pf)(Args...)) const noexcept
Expand Down
2 changes: 1 addition & 1 deletion include/pybind11/pybind11.h
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ PYBIND11_NAMESPACE_BEGIN(PYBIND11_NAMESPACE)
/// Wraps an arbitrary C++ function/method/lambda function/.. into a callable Python object
class cpp_function : public function {
public:
cpp_function() { }
cpp_function() = default;
cpp_function(std::nullptr_t) { }

/// Construct a cpp_function from a vanilla function pointer
Expand Down
6 changes: 3 additions & 3 deletions tests/test_class.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ TEST_SUBMODULE(class_, m) {
BaseClass() = default;
BaseClass(const BaseClass &) = default;
BaseClass(BaseClass &&) = default;
virtual ~BaseClass() {}
virtual ~BaseClass() = default;
};
struct DerivedClass1 : BaseClass { };
struct DerivedClass2 : BaseClass { };
Expand Down Expand Up @@ -353,7 +353,7 @@ TEST_SUBMODULE(class_, m) {
// test_reentrant_implicit_conversion_failure
// #1035: issue with runaway reentrant implicit conversion
struct BogusImplicitConversion {
BogusImplicitConversion(const BogusImplicitConversion &) { }
BogusImplicitConversion(const BogusImplicitConversion &) = default;
};

py::class_<BogusImplicitConversion>(m, "BogusImplicitConversion")
Expand Down Expand Up @@ -407,7 +407,7 @@ TEST_SUBMODULE(class_, m) {
py::class_<IsNonFinalFinal>(m, "IsNonFinalFinal", py::is_final());

struct PyPrintDestructor {
PyPrintDestructor() {}
PyPrintDestructor() = default;
~PyPrintDestructor() {
py::print("Print from destructor");
}
Expand Down
4 changes: 2 additions & 2 deletions tests/test_copy_move.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,14 @@ struct empty {
};

struct lacking_copy_ctor : public empty<lacking_copy_ctor> {
lacking_copy_ctor() {}
lacking_copy_ctor() = default;
lacking_copy_ctor(const lacking_copy_ctor& other) = delete;
};

template <> lacking_copy_ctor empty<lacking_copy_ctor>::instance_ = {};

struct lacking_move_ctor : public empty<lacking_move_ctor> {
lacking_move_ctor() {}
lacking_move_ctor() = default;
lacking_move_ctor(const lacking_move_ctor& other) = delete;
lacking_move_ctor(lacking_move_ctor&& other) = delete;
};
Expand Down
2 changes: 1 addition & 1 deletion tests/test_smart_ptr.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -339,7 +339,7 @@ TEST_SUBMODULE(smart_ptr, m) {
// test_shared_ptr_gc
// #187: issue involving std::shared_ptr<> return value policy & garbage collection
struct ElementBase {
virtual ~ElementBase() { } /* Force creation of virtual table */
virtual ~ElementBase() = default; /* Force creation of virtual table */
ElementBase() = default;
ElementBase(const ElementBase&) = delete;
};
Expand Down
6 changes: 3 additions & 3 deletions tests/test_virtual_functions.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ class Movable {

class NCVirt {
public:
virtual ~NCVirt() { }
virtual ~NCVirt() = default;
NCVirt() = default;
NCVirt(const NCVirt&) = delete;
virtual NonCopyable get_noncopyable(int a, int b) { return NonCopyable(a, b); }
Expand Down Expand Up @@ -227,7 +227,7 @@ TEST_SUBMODULE(virtual_functions, m) {
struct A {
A() = default;
A(const A&) = delete;
virtual ~A() {}
virtual ~A() = default;
virtual void f() { py::print("A.f()"); }
};

Expand Down Expand Up @@ -255,7 +255,7 @@ TEST_SUBMODULE(virtual_functions, m) {
struct A2 {
A2() = default;
A2(const A2&) = delete;
virtual ~A2() {}
virtual ~A2() = default;
virtual void f() { py::print("A2.f()"); }
};

Expand Down

0 comments on commit b491b46

Please sign in to comment.