diff options
Diffstat (limited to 'source/blender/io/common')
3 files changed, 6 insertions, 6 deletions
diff --git a/source/blender/io/common/intern/abstract_hierarchy_iterator.cc b/source/blender/io/common/intern/abstract_hierarchy_iterator.cc index fc47b024be1..eaa4d2fdde7 100644 --- a/source/blender/io/common/intern/abstract_hierarchy_iterator.cc +++ b/source/blender/io/common/intern/abstract_hierarchy_iterator.cc @@ -19,10 +19,10 @@ #include "IO_abstract_hierarchy_iterator.h" #include "dupli_parent_finder.hh" +#include <climits> +#include <cstdio> #include <iostream> -#include <limits.h> #include <sstream> -#include <stdio.h> #include <string> #include "BKE_anim_data.h" 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(); diff --git a/source/blender/io/common/intern/object_identifier.cc b/source/blender/io/common/intern/object_identifier.cc index a2d2d998bec..5d0b89b0630 100644 --- a/source/blender/io/common/intern/object_identifier.cc +++ b/source/blender/io/common/intern/object_identifier.cc @@ -21,7 +21,7 @@ #include "BKE_duplilist.h" extern "C" { -#include <limits.h> /* For INT_MAX. */ +#include <climits> /* For INT_MAX. */ } #include <cstring> #include <sstream> |