diff options
7 files changed, 28 insertions, 28 deletions
diff --git a/source/blender/blenkernel/intern/attribute_access.cc b/source/blender/blenkernel/intern/attribute_access.cc index 2345c834be4..9f5795291f0 100644 --- a/source/blender/blenkernel/intern/attribute_access.cc +++ b/source/blender/blenkernel/intern/attribute_access.cc @@ -325,7 +325,7 @@ class ConstantReadAttribute final : public ReadAttribute { type.copy_to_uninitialized(value, value_); } - ~ConstantReadAttribute() + ~ConstantReadAttribute() override { this->cpp_type_.destruct(value_); MEM_freeN(value_); diff --git a/source/blender/depsgraph/intern/builder/pipeline_all_objects.cc b/source/blender/depsgraph/intern/builder/pipeline_all_objects.cc index d02aa16f26b..dd71cc0504e 100644 --- a/source/blender/depsgraph/intern/builder/pipeline_all_objects.cc +++ b/source/blender/depsgraph/intern/builder/pipeline_all_objects.cc @@ -36,7 +36,7 @@ class AllObjectsNodeBuilder : public DepsgraphNodeBuilder { { } - virtual bool need_pull_base_into_graph(Base * /*base*/) override + bool need_pull_base_into_graph(Base * /*base*/) override { return true; } @@ -49,7 +49,7 @@ class AllObjectsRelationBuilder : public DepsgraphRelationBuilder { { } - virtual bool need_pull_base_into_graph(Base * /*base*/) override + bool need_pull_base_into_graph(Base * /*base*/) override { return true; } diff --git a/source/blender/depsgraph/intern/builder/pipeline_from_ids.cc b/source/blender/depsgraph/intern/builder/pipeline_from_ids.cc index 5fd4a0fc3dd..9e62432ea54 100644 --- a/source/blender/depsgraph/intern/builder/pipeline_from_ids.cc +++ b/source/blender/depsgraph/intern/builder/pipeline_from_ids.cc @@ -55,7 +55,7 @@ class DepsgraphFromIDsNodeBuilder : public DepsgraphNodeBuilder { { } - virtual bool need_pull_base_into_graph(Base *base) override + bool need_pull_base_into_graph(Base *base) override { if (!filter_.contains(&base->object->id)) { return false; @@ -63,7 +63,7 @@ class DepsgraphFromIDsNodeBuilder : public DepsgraphNodeBuilder { return DepsgraphNodeBuilder::need_pull_base_into_graph(base); } - virtual void build_object_proxy_group(Object *object, bool is_visible) override + void build_object_proxy_group(Object *object, bool is_visible) override { if (object->proxy_group == nullptr) { return; @@ -88,7 +88,7 @@ class DepsgraphFromIDsRelationBuilder : public DepsgraphRelationBuilder { { } - virtual bool need_pull_base_into_graph(Base *base) override + bool need_pull_base_into_graph(Base *base) override { if (!filter_.contains(&base->object->id)) { return false; @@ -96,7 +96,7 @@ class DepsgraphFromIDsRelationBuilder : public DepsgraphRelationBuilder { return DepsgraphRelationBuilder::need_pull_base_into_graph(base); } - virtual void build_object_proxy_group(Object *object) override + void build_object_proxy_group(Object *object) override { if (object->proxy_group == nullptr) { return; diff --git a/source/blender/freestyle/intern/view_map/ViewMapBuilder.cpp b/source/blender/freestyle/intern/view_map/ViewMapBuilder.cpp index de30ee0460a..54f4da7ca40 100644 --- a/source/blender/freestyle/intern/view_map/ViewMapBuilder.cpp +++ b/source/blender/freestyle/intern/view_map/ViewMapBuilder.cpp @@ -2326,7 +2326,7 @@ struct silhouette_binary_rule : public binary_rule<segment, segment> { { } - virtual bool operator()(segment &s1, segment &s2) + bool operator()(segment &s1, segment &s2) override { FEdge *f1 = s1.edge(); FEdge *f2 = s2.edge(); diff --git a/source/blender/imbuf/intern/openexr/openexr_api.cpp b/source/blender/imbuf/intern/openexr/openexr_api.cpp index 28d73bff47d..cb933062d37 100644 --- a/source/blender/imbuf/intern/openexr/openexr_api.cpp +++ b/source/blender/imbuf/intern/openexr/openexr_api.cpp @@ -120,11 +120,11 @@ class IMemStream : public Imf::IStream { _exrbuf = exrbuf; } - virtual ~IMemStream() + ~IMemStream() override { } - virtual bool read(char c[], int n) + bool read(char c[], int n) override { if (n + _exrpos <= _exrsize) { memcpy(c, (void *)(&_exrbuf[_exrpos]), n); @@ -135,17 +135,17 @@ class IMemStream : public Imf::IStream { return false; } - virtual Int64 tellg() + Int64 tellg() override { return _exrpos; } - virtual void seekg(Int64 pos) + void seekg(Int64 pos) override { _exrpos = pos; } - virtual void clear() + void clear() override { } @@ -175,7 +175,7 @@ class IFileStream : public Imf::IStream { } } - virtual bool read(char c[], int n) + bool read(char c[], int n) override { if (!ifs) { throw Iex::InputExc("Unexpected end of file."); @@ -186,18 +186,18 @@ class IFileStream : public Imf::IStream { return check_error(); } - virtual Int64 tellg() + Int64 tellg() override { return std::streamoff(ifs.tellg()); } - virtual void seekg(Int64 pos) + void seekg(Int64 pos) override { ifs.seekg(pos); check_error(); } - virtual void clear() + void clear() override { ifs.clear(); } @@ -227,7 +227,7 @@ class OMemStream : public OStream { { } - virtual void write(const char c[], int n) + void write(const char c[], int n) override { ensure_size(offset + n); memcpy(ibuf->encodedbuffer + offset, c, n); @@ -235,12 +235,12 @@ class OMemStream : public OStream { ibuf->encodedsize += n; } - virtual Int64 tellp() + Int64 tellp() override { return offset; } - virtual void seekp(Int64 pos) + void seekp(Int64 pos) override { offset = pos; ensure_size(offset); @@ -281,19 +281,19 @@ class OFileStream : public OStream { } } - virtual void write(const char c[], int n) + void write(const char c[], int n) override { errno = 0; ofs.write(c, n); check_error(); } - virtual Int64 tellp() + Int64 tellp() override { return std::streamoff(ofs.tellp()); } - virtual void seekp(Int64 pos) + void seekp(Int64 pos) override { ofs.seekp(pos); check_error(); diff --git a/source/blender/io/alembic/tests/abc_export_test.cc b/source/blender/io/alembic/tests/abc_export_test.cc index e1a9bd34f6b..e20fe2ff492 100644 --- a/source/blender/io/alembic/tests/abc_export_test.cc +++ b/source/blender/io/alembic/tests/abc_export_test.cc @@ -23,7 +23,7 @@ class AlembicExportTest : public testing::Test { Depsgraph *depsgraph; Main *bmain; - virtual void SetUp() + void SetUp() override { abc_archive = nullptr; @@ -41,7 +41,7 @@ class AlembicExportTest : public testing::Test { depsgraph = DEG_graph_new(bmain, &scene, view_layer, DAG_EVAL_RENDER); } - virtual void TearDown() + void TearDown() override { BKE_main_free(bmain); DEG_graph_free(depsgraph); diff --git a/source/blender/io/common/intern/abstract_hierarchy_iterator_test.cc b/source/blender/io/common/intern/abstract_hierarchy_iterator_test.cc index ad0d6820e2b..8acdba416d3 100644 --- a/source/blender/io/common/intern/abstract_hierarchy_iterator_test.cc +++ b/source/blender/io/common/intern/abstract_hierarchy_iterator_test.cc @@ -73,7 +73,7 @@ class TestingHierarchyIterator : public AbstractHierarchyIterator { explicit TestingHierarchyIterator(Depsgraph *depsgraph) : AbstractHierarchyIterator(depsgraph) { } - virtual ~TestingHierarchyIterator() + ~TestingHierarchyIterator() override { release_writers(); } @@ -106,13 +106,13 @@ class AbstractHierarchyIteratorTest : public BlendfileLoadingBaseTest { protected: TestingHierarchyIterator *iterator; - virtual void SetUp() + void SetUp() override { BlendfileLoadingBaseTest::SetUp(); iterator = nullptr; } - virtual void TearDown() + void TearDown() override { iterator_free(); BlendfileLoadingBaseTest::TearDown(); |