Skip to content

Commit 221e52b

Browse files
authored
Merge pull request #49 from ferdymercury/patch-1
apply clang-tidy modernize-use-override
2 parents 59713a0 + 06986be commit 221e52b

File tree

3 files changed

+24
-24
lines changed

3 files changed

+24
-24
lines changed

include/CPyCppyy/PyException.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,10 @@ namespace CPyCppyy {
3939
class CPYCPPYY_CLASS_EXTERN PyException : public std::exception {
4040
public:
4141
PyException();
42-
virtual ~PyException() noexcept;
42+
~PyException() noexcept override;
4343

4444
// give reason for raised exception
45-
virtual const char* what() const noexcept;
45+
const char* what() const noexcept override;
4646

4747
// clear Python error, to allow full error handling C++ side
4848
void clear() const noexcept;

src/CPPOverload.cxx

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -54,48 +54,48 @@ class TPythonCallback : public PyCallable {
5454
fCallable = callable;
5555
}
5656

57-
virtual ~TPythonCallback() {
57+
~TPythonCallback() override {
5858
Py_DECREF(fCallable);
5959
fCallable = nullptr;
6060
}
6161

62-
virtual PyObject* GetSignature(bool /*show_formalargs*/ = true) {
62+
PyObject* GetSignature(bool /*show_formalargs*/ = true) override {
6363
return CPyCppyy_PyText_FromString("*args, **kwargs");
6464
}
65-
virtual PyObject* GetPrototype(bool /*show_formalargs*/ = true) {
65+
PyObject* GetPrototype(bool /*show_formalargs*/ = true) override {
6666
return CPyCppyy_PyText_FromString("<callback>");
6767
}
68-
virtual PyObject* GetDocString() {
68+
PyObject* GetDocString() override {
6969
if (PyObject_HasAttrString(fCallable, "__doc__")) {
7070
return PyObject_GetAttrString(fCallable, "__doc__");
7171
} else {
7272
return GetPrototype();
7373
}
7474
}
7575

76-
virtual int GetPriority() { return 100; };
77-
virtual bool IsGreedy() { return false; };
76+
int GetPriority() override { return 100; };
77+
bool IsGreedy() override { return false; };
7878

79-
virtual int GetMaxArgs() { return 100; };
80-
virtual PyObject* GetCoVarNames() { // TODO: pick these up from the callable
79+
int GetMaxArgs() override { return 100; };
80+
PyObject* GetCoVarNames() override { // TODO: pick these up from the callable
8181
Py_RETURN_NONE;
8282
}
83-
virtual PyObject* GetArgDefault(int /* iarg */, bool /* silent */ =true) {
83+
PyObject* GetArgDefault(int /* iarg */, bool /* silent */ =true) override {
8484
Py_RETURN_NONE; // TODO: pick these up from the callable
8585
}
8686

87-
virtual PyObject* GetScopeProxy() { // should this be the module ??
87+
PyObject* GetScopeProxy() override { // should this be the module ??
8888
Py_RETURN_NONE;
8989
}
9090

91-
virtual Cppyy::TCppFuncAddr_t GetFunctionAddress() {
91+
Cppyy::TCppFuncAddr_t GetFunctionAddress() override {
9292
return (Cppyy::TCppFuncAddr_t)nullptr;
9393
}
9494

95-
virtual PyCallable* Clone() { return new TPythonCallback(*this); }
95+
PyCallable* Clone() override { return new TPythonCallback(*this); }
9696

97-
virtual PyObject* Call(CPPInstance*& self,
98-
CPyCppyy_PyArgs_t args, size_t nargsf, PyObject* kwds, CallContext* /* ctxt = 0 */) {
97+
PyObject* Call(CPPInstance*& self,
98+
CPyCppyy_PyArgs_t args, size_t nargsf, PyObject* kwds, CallContext* /* ctxt = 0 */) override {
9999

100100
#if PY_VERSION_HEX >= 0x03080000
101101
if (self) {

src/Pythonize.cxx

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -237,8 +237,8 @@ struct CountedItemGetter : public ItemGetter {
237237

238238
struct TupleItemGetter : public CountedItemGetter {
239239
using CountedItemGetter::CountedItemGetter;
240-
virtual Py_ssize_t size() { return PyTuple_GET_SIZE(fPyObject); }
241-
virtual PyObject* get() {
240+
Py_ssize_t size() override { return PyTuple_GET_SIZE(fPyObject); }
241+
PyObject* get() override {
242242
if (fCur < PyTuple_GET_SIZE(fPyObject)) {
243243
PyObject* item = PyTuple_GET_ITEM(fPyObject, fCur++);
244244
Py_INCREF(item);
@@ -251,8 +251,8 @@ struct TupleItemGetter : public CountedItemGetter {
251251

252252
struct ListItemGetter : public CountedItemGetter {
253253
using CountedItemGetter::CountedItemGetter;
254-
virtual Py_ssize_t size() { return PyList_GET_SIZE(fPyObject); }
255-
virtual PyObject* get() {
254+
Py_ssize_t size() override { return PyList_GET_SIZE(fPyObject); }
255+
PyObject* get() override {
256256
if (fCur < PyList_GET_SIZE(fPyObject)) {
257257
PyObject* item = PyList_GET_ITEM(fPyObject, fCur++);
258258
Py_INCREF(item);
@@ -265,21 +265,21 @@ struct ListItemGetter : public CountedItemGetter {
265265

266266
struct SequenceItemGetter : public CountedItemGetter {
267267
using CountedItemGetter::CountedItemGetter;
268-
virtual Py_ssize_t size() {
268+
Py_ssize_t size() override {
269269
Py_ssize_t sz = PySequence_Size(fPyObject);
270270
if (sz < 0) {
271271
PyErr_Clear();
272272
return PyObject_LengthHint(fPyObject, 8);
273273
}
274274
return sz;
275275
}
276-
virtual PyObject* get() { return PySequence_GetItem(fPyObject, fCur++); }
276+
PyObject* get() override { return PySequence_GetItem(fPyObject, fCur++); }
277277
};
278278

279279
struct IterItemGetter : public ItemGetter {
280280
using ItemGetter::ItemGetter;
281-
virtual Py_ssize_t size() { return PyObject_LengthHint(fPyObject, 8); }
282-
virtual PyObject* get() { return (*(Py_TYPE(fPyObject)->tp_iternext))(fPyObject); }
281+
Py_ssize_t size() override { return PyObject_LengthHint(fPyObject, 8); }
282+
PyObject* get() override { return (*(Py_TYPE(fPyObject)->tp_iternext))(fPyObject); }
283283
};
284284

285285
static ItemGetter* GetGetter(PyObject* args)

0 commit comments

Comments
 (0)