From 8a9bc5ef32c425491830603fef5c230176baab3a Mon Sep 17 00:00:00 2001
From: Kunal Tyagi <tyagi.kunal@live.com>
Date: Sun, 1 Mar 2020 20:48:05 +0900
Subject: [PATCH] For compilation, might be temp

---
 octree/include/pcl/octree/octree_container.h | 6 ++++--
 octree/include/pcl/octree/octree_key.h       | 4 +++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/octree/include/pcl/octree/octree_container.h b/octree/include/pcl/octree/octree_container.h
index 832380049b9..ddd2c46f4a0 100644
--- a/octree/include/pcl/octree/octree_container.h
+++ b/octree/include/pcl/octree/octree_container.h
@@ -38,10 +38,12 @@
 
 #pragma once
 
-#include <cstddef>
+#include <pcl/pcl_macros.h>
+
 #include <vector>
 
-#include <pcl/pcl_macros.h>
+#include <cassert>
+#include <cstddef>
 
 namespace pcl {
 namespace octree {
diff --git a/octree/include/pcl/octree/octree_key.h b/octree/include/pcl/octree/octree_key.h
index 4bb85a69230..4307d74e14f 100644
--- a/octree/include/pcl/octree/octree_key.h
+++ b/octree/include/pcl/octree/octree_key.h
@@ -37,6 +37,8 @@
 
 #pragma once
 
+#include <cstring> // for memcpy
+
 namespace pcl {
 namespace octree {
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -57,7 +59,7 @@ class OctreeKey {
   {}
 
   /** \brief Copy constructor. */
-  OctreeKey(const OctreeKey& source) { memcpy(key_, source.key_, sizeof(key_)); }
+  OctreeKey(const OctreeKey& source) { std::memcpy(key_, source.key_, sizeof(key_)); }
 
   OctreeKey&
   operator=(const OctreeKey&) = default;