Support Noetic (#297)

* Enable C++14 to support PCL 1.10 * Fix new lint errors
at-wat · Apr 6, 2020 · 484f788 · 484f788
1 parent 5787c19
commit 484f788
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 4 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.0.2)
+cmake_minimum_required(VERSION 3.1.3)
 project(mcl_3dl)
 
 set(CATKIN_DEPENDS
@@ -34,8 +34,9 @@ catkin_package(
   CATKIN_DEPENDS ${CATKIN_DEPENDS}
 )
 
+set(CMAKE_CXX_STANDARD 14)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
-add_compile_options(-std=c++11)
 include_directories(include ${catkin_INCLUDE_DIRS} ${EIGEN3_INCLUDE_DIR} ${Boost_INCLUDE_DIRS} ${PCL_INCLUDE_DIR})
 add_definitions(${PCL_DEFINITIONS})
 

diff --git a/include/mcl_3dl/chunked_kdtree.h b/include/mcl_3dl/chunked_kdtree.h
@@ -31,6 +31,7 @@
 #define MCL_3DL_CHUNKED_KDTREE_H
 
 #include <cmath>
+#include <memory>
 #include <stdexcept>
 #include <unordered_map>
 #include <vector>

diff --git a/include/mcl_3dl/cloud_accum.h b/include/mcl_3dl/cloud_accum.h
@@ -30,9 +30,10 @@
 #ifndef MCL_3DL_CLOUD_ACCUM_H
 #define MCL_3DL_CLOUD_ACCUM_H
 
-#include <vector>
-#include <string>
 #include <functional>
+#include <memory>
+#include <string>
+#include <vector>
 
 #include <sensor_msgs/PointCloud2.h>
 

diff --git a/include/mcl_3dl/lidar_measurement_model_base.h b/include/mcl_3dl/lidar_measurement_model_base.h
@@ -30,6 +30,7 @@
 #ifndef MCL_3DL_LIDAR_MEASUREMENT_MODEL_BASE_H
 #define MCL_3DL_LIDAR_MEASUREMENT_MODEL_BASE_H
 
+#include <memory>
 #include <string>
 #include <utility>
 #include <vector>

diff --git a/include/mcl_3dl/lidar_measurement_models/lidar_measurement_model_beam.h b/include/mcl_3dl/lidar_measurement_models/lidar_measurement_model_beam.h
@@ -30,6 +30,7 @@
 #ifndef MCL_3DL_LIDAR_MEASUREMENT_MODELS_LIDAR_MEASUREMENT_MODEL_BEAM_H
 #define MCL_3DL_LIDAR_MEASUREMENT_MODELS_LIDAR_MEASUREMENT_MODEL_BEAM_H
 
+#include <memory>
 #include <string>
 #include <vector>
 

diff --git a/include/mcl_3dl/lidar_measurement_models/lidar_measurement_model_likelihood.h b/include/mcl_3dl/lidar_measurement_models/lidar_measurement_model_likelihood.h
@@ -30,6 +30,7 @@
 #ifndef MCL_3DL_LIDAR_MEASUREMENT_MODELS_LIDAR_MEASUREMENT_MODEL_LIKELIHOOD_H
 #define MCL_3DL_LIDAR_MEASUREMENT_MODELS_LIDAR_MEASUREMENT_MODEL_LIKELIHOOD_H
 
+#include <memory>
 #include <string>
 #include <vector>
 

diff --git a/include/mcl_3dl/parameters.h b/include/mcl_3dl/parameters.h
@@ -29,6 +29,8 @@
 #ifndef MCL_3DL_PARAMETERS_H
 #define MCL_3DL_PARAMETERS_H
 
+#include <memory>
+
 namespace mcl_3dl
 {
 class Parameters

diff --git a/include/mcl_3dl/point_cloud_random_sampler.h b/include/mcl_3dl/point_cloud_random_sampler.h
@@ -30,6 +30,7 @@
 #ifndef MCL_3DL_POINT_CLOUD_RANDOM_SAMPLER_H
 #define MCL_3DL_POINT_CLOUD_RANDOM_SAMPLER_H
 
+#include <memory>
 #include <random>
 
 #include <pcl/point_types.h>