From 4f03d502e65174e29da1aecd17019f596de8048b Mon Sep 17 00:00:00 2001 From: Iliya Katueshenock Date: Mon, 13 Nov 2023 10:42:29 +0100 Subject: [PATCH] Cleanup: Remove iostreams include from timeit header Continuation of #110986 Pull Request: https://projects.blender.org/blender/blender/pulls/111010 --- source/blender/blenkernel/intern/grease_pencil.cc | 2 ++ .../blender/blenkernel/intern/mesh_boolean_convert.cc | 2 ++ source/blender/blenlib/BLI_timeit.hh | 11 +---------- .../blender/blenlib/intern/generic_virtual_array.cc | 2 ++ source/blender/blenlib/intern/index_mask.cc | 1 + source/blender/blenlib/intern/timeit.cc | 11 +++++++++++ source/blender/functions/FN_field.hh | 2 ++ source/blender/io/ply/IO_ply.cc | 2 ++ source/blender/io/stl/importer/stl_import_mesh.cc | 2 ++ source/blender/io/usd/intern/usd_capi_export.cc | 2 ++ source/blender/io/wavefront_obj/IO_wavefront_obj.cc | 2 ++ .../io/wavefront_obj/importer/obj_import_mesh.cc | 2 ++ 12 files changed, 31 insertions(+), 10 deletions(-) diff --git a/source/blender/blenkernel/intern/grease_pencil.cc b/source/blender/blenkernel/intern/grease_pencil.cc index 4c3faa0b81d..c604a3c524c 100644 --- a/source/blender/blenkernel/intern/grease_pencil.cc +++ b/source/blender/blenkernel/intern/grease_pencil.cc @@ -6,6 +6,8 @@ * \ingroup bke */ +#include + #include "BKE_anim_data.h" #include "BKE_curves.hh" #include "BKE_customdata.h" diff --git a/source/blender/blenkernel/intern/mesh_boolean_convert.cc b/source/blender/blenkernel/intern/mesh_boolean_convert.cc index c395218f120..f655cf52501 100644 --- a/source/blender/blenkernel/intern/mesh_boolean_convert.cc +++ b/source/blender/blenkernel/intern/mesh_boolean_convert.cc @@ -6,6 +6,8 @@ * \ingroup bke */ +#include + #include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" #include "DNA_object_types.h" diff --git a/source/blender/blenlib/BLI_timeit.hh b/source/blender/blenlib/BLI_timeit.hh index dd3310f2399..96302cc13e2 100644 --- a/source/blender/blenlib/BLI_timeit.hh +++ b/source/blender/blenlib/BLI_timeit.hh @@ -5,7 +5,6 @@ #pragma once #include -#include #include #include "BLI_sys_types.h" @@ -29,15 +28,7 @@ class ScopedTimer { start_ = Clock::now(); } - ~ScopedTimer() - { - const TimePoint end = Clock::now(); - const Nanoseconds duration = end - start_; - - std::cout << "Timer '" << name_ << "' took "; - print_duration(duration); - std::cout << '\n'; - } + ~ScopedTimer(); }; class ScopedTimerAveraged { diff --git a/source/blender/blenlib/intern/generic_virtual_array.cc b/source/blender/blenlib/intern/generic_virtual_array.cc index 8771592c06e..6027273ecee 100644 --- a/source/blender/blenlib/intern/generic_virtual_array.cc +++ b/source/blender/blenlib/intern/generic_virtual_array.cc @@ -2,6 +2,8 @@ * * SPDX-License-Identifier: GPL-2.0-or-later */ +#include + #include "BLI_generic_virtual_array.hh" namespace blender { diff --git a/source/blender/blenlib/intern/index_mask.cc b/source/blender/blenlib/intern/index_mask.cc index d0518066336..f20c09f4925 100644 --- a/source/blender/blenlib/intern/index_mask.cc +++ b/source/blender/blenlib/intern/index_mask.cc @@ -2,6 +2,7 @@ * * SPDX-License-Identifier: GPL-2.0-or-later */ +#include #include #include "BLI_array.hh" diff --git a/source/blender/blenlib/intern/timeit.cc b/source/blender/blenlib/intern/timeit.cc index da699ff4902..8a578cefabf 100644 --- a/source/blender/blenlib/intern/timeit.cc +++ b/source/blender/blenlib/intern/timeit.cc @@ -6,6 +6,7 @@ #include #include +#include namespace blender::timeit { @@ -31,6 +32,16 @@ void print_duration(Nanoseconds duration) } } +ScopedTimer::~ScopedTimer() +{ + const TimePoint end = Clock::now(); + const Nanoseconds duration = end - start_; + + std::cout << "Timer '" << name_ << "' took "; + print_duration(duration); + std::cout << '\n'; +} + ScopedTimerAveraged::~ScopedTimerAveraged() { const TimePoint end = Clock::now(); diff --git a/source/blender/functions/FN_field.hh b/source/blender/functions/FN_field.hh index 22ec0b0f1a4..24c0b214558 100644 --- a/source/blender/functions/FN_field.hh +++ b/source/blender/functions/FN_field.hh @@ -34,6 +34,8 @@ * they share common sub-fields and a common context. */ +#include + #include "BLI_function_ref.hh" #include "BLI_generic_virtual_array.hh" #include "BLI_string_ref.hh" diff --git a/source/blender/io/ply/IO_ply.cc b/source/blender/io/ply/IO_ply.cc index 872d0461722..59b7358bf51 100644 --- a/source/blender/io/ply/IO_ply.cc +++ b/source/blender/io/ply/IO_ply.cc @@ -6,6 +6,8 @@ * \ingroup ply */ +#include + #include "BLI_timeit.hh" #include "DNA_windowmanager_types.h" diff --git a/source/blender/io/stl/importer/stl_import_mesh.cc b/source/blender/io/stl/importer/stl_import_mesh.cc index 75758c0f579..da4a8838651 100644 --- a/source/blender/io/stl/importer/stl_import_mesh.cc +++ b/source/blender/io/stl/importer/stl_import_mesh.cc @@ -6,6 +6,8 @@ * \ingroup stl */ +#include + #include "BKE_customdata.h" #include "BKE_lib_id.h" #include "BKE_main.h" diff --git a/source/blender/io/usd/intern/usd_capi_export.cc b/source/blender/io/usd/intern/usd_capi_export.cc index f13b0284397..eb54fea9a03 100644 --- a/source/blender/io/usd/intern/usd_capi_export.cc +++ b/source/blender/io/usd/intern/usd_capi_export.cc @@ -2,6 +2,8 @@ * * SPDX-License-Identifier: GPL-2.0-or-later */ +#include + #include "usd.h" #include "usd.hh" #include "usd_hierarchy_iterator.h" diff --git a/source/blender/io/wavefront_obj/IO_wavefront_obj.cc b/source/blender/io/wavefront_obj/IO_wavefront_obj.cc index 7aacfacf988..e730c6048ec 100644 --- a/source/blender/io/wavefront_obj/IO_wavefront_obj.cc +++ b/source/blender/io/wavefront_obj/IO_wavefront_obj.cc @@ -6,6 +6,8 @@ * \ingroup obj */ +#include + #include "BLI_path_util.h" #include "BLI_timeit.hh" diff --git a/source/blender/io/wavefront_obj/importer/obj_import_mesh.cc b/source/blender/io/wavefront_obj/importer/obj_import_mesh.cc index aef507f9485..4bd61d1df26 100644 --- a/source/blender/io/wavefront_obj/importer/obj_import_mesh.cc +++ b/source/blender/io/wavefront_obj/importer/obj_import_mesh.cc @@ -6,6 +6,8 @@ * \ingroup obj */ +#include + #include "DNA_material_types.h" #include "DNA_mesh_types.h" #include "DNA_scene_types.h"