Minor fixups due to conflicts.

PointCloudLibrary · Sep 20, 2024 · 1f491cc · 1f491cc
1 parent 7fd9f1f
commit 1f491cc
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 9 deletions.
diff --git a/gpu/octree/src/octree.cpp b/gpu/octree/src/octree.cpp
@@ -34,8 +34,8 @@
  *  Author: Anatoly Baskeheev, Itseez Ltd, (myname.mysurname@mycompany.com)
  */
 
-#include <pcl/gpu/containers/initialization.h>
 #include <pcl/gpu/octree/octree.hpp>
+#include <pcl/gpu/utils/initialization.h>
 #include <pcl/gpu/utils/timers_cuda.hpp>
 #include <pcl/gpu/utils/safe_call.hpp>
 

diff --git a/sample_consensus/src/sac_model_torus.cpp b/sample_consensus/src/sac_model_torus.cpp
@@ -35,18 +35,10 @@
  *
  */
 
-<<<<<<<< HEAD:sample_consensus/src/sac_model_torus.cpp
 #include <pcl/sample_consensus/impl/sac_model_torus.hpp>
 
 #ifndef PCL_NO_PRECOMPILE
 #include <pcl/impl/instantiate.hpp>
 #include <pcl/point_types.h>
 PCL_INSTANTIATE_PRODUCT(SampleConsensusModelTorus, ((pcl::PointXYZ)(pcl::PointXYZI)(pcl::PointXYZRGBA)(pcl::PointXYZRGB))((pcl::Normal)))
 #endif    // PCL_NO_PRECOMPILE
-
-========
-#include <pcl/gpu/containers/impl/internal.hpp>
-#include <pcl/gpu/containers/impl/repacks.hpp>
-
-#include <cassert>
->>>>>>>> bd73969fa (Change to use target_include_directories.):gpu/containers/src/repacks.cpp