# HG changeset patch # User Chris Cannam # Date 1571235961 -3600 # Node ID c7e9e63c7bae85eb6657d3055da5502520acf6b8 # Parent 3db9a9fc2612c8d9b5c70c76681e9d676678cbc6 Avoid some compiler warnings diff -r 3db9a9fc2612 -r c7e9e63c7bae base/ById.cpp --- a/base/ById.cpp Wed Oct 16 12:12:49 2019 +0100 +++ b/base/ById.cpp Wed Oct 16 15:26:01 2019 +0100 @@ -36,6 +36,10 @@ return i; } +// "warning: expression with side effects will be evaluated despite +// being used as an operand to 'typeid'" +#pragma GCC diagnostic ignored "-Wpotentially-evaluated-expression" + class AnyById::Impl { public: diff -r 3db9a9fc2612 -r c7e9e63c7bae data/model/DenseThreeDimensionalModel.h --- a/data/model/DenseThreeDimensionalModel.h Wed Oct 16 12:12:49 2019 +0100 +++ b/data/model/DenseThreeDimensionalModel.h Wed Oct 16 15:26:01 2019 +0100 @@ -133,9 +133,9 @@ int getColumnCount() const override { return getHeight() + 2; } bool isEditable() const override { return false; } - Command *getSetDataCommand(int, int, const QVariant &, int) { return nullptr; } - Command *getInsertRowCommand(int) { return nullptr; } - Command *getRemoveRowCommand(int) { return nullptr; } + Command *getSetDataCommand(int, int, const QVariant &, int) override { return nullptr; } + Command *getInsertRowCommand(int) override { return nullptr; } + Command *getRemoveRowCommand(int) override { return nullptr; } QString getHeading(int column) const override {