[Bf-blender-cvs] [cab8a76abf7] master: Fix: wrong clang tidy cleanup

Jacques Lucke noreply at git.blender.org
Mon Feb 15 19:04:02 CET 2021


Commit: cab8a76abf73e61034eed685dd0c77178025f401
Author: Jacques Lucke
Date:   Mon Feb 15 19:03:27 2021 +0100
Branches: master
https://developer.blender.org/rBcab8a76abf73e61034eed685dd0c77178025f401

Fix: wrong clang tidy cleanup

This reverts a part of rBd3960164163c910d5031a8f076c41b39e0a5503d.
It is not a `std::shared_ptr` but a `boost::shared_ptr`.
This could probably be fixed differently, but `NOLINT` is fine now.

===================================================================

M	source/blender/io/alembic/exporter/abc_archive.cc

===================================================================

diff --git a/source/blender/io/alembic/exporter/abc_archive.cc b/source/blender/io/alembic/exporter/abc_archive.cc
index 6c6ad985c9b..e066704cd24 100644
--- a/source/blender/io/alembic/exporter/abc_archive.cc
+++ b/source/blender/io/alembic/exporter/abc_archive.cc
@@ -141,13 +141,13 @@ static TimeSamplingPtr create_time_sampling(double scene_fps,
   std::vector<double> samples;
 
   if (params.frame_start == params.frame_end) {
-    return std::make_shared<TimeSampling>();
+    return TimeSamplingPtr(new TimeSampling());  // NOLINT: modernize-make-shared
   }
 
   get_shutter_samples(scene_fps, params, nr_of_samples, true, samples);
 
   TimeSamplingType ts(static_cast<uint32_t>(samples.size()), 1.0 / scene_fps);
-  return std::make_shared<TimeSampling>(ts, samples);
+  return TimeSamplingPtr(new TimeSampling(ts, samples));  // NOLINT: modernize-make-shared
 }
 
 static void get_frames(double scene_fps,



More information about the Bf-blender-cvs mailing list