Release 2.2.1 (#22)

* Fix build with C++ 17 * Suppressed python code generation build output
carla-simulator · Aug 27, 2020 · e4bbd48 · e4bbd48
1 parent 9c25cb4
commit e4bbd48
Show file tree

Hide file tree

Showing 14 changed files with 33 additions and 19 deletions.
diff --git a/ad_map_access/generated/CMakeLists.txt b/ad_map_access/generated/CMakeLists.txt
@@ -14,7 +14,7 @@
 ##
 
 cmake_minimum_required(VERSION 3.5)
-project(ad_map_access VERSION 2.2.0)
+project(ad_map_access VERSION 2.2.1)
 
 include(GNUInstallDirs)
 include(CMakePackageConfigHelpers)
@@ -47,7 +47,7 @@ get_target_property(AD_MAP_OPENDRIVE_READER_INTERFACE_INCLUDE_DIRS ad_map_opendr
 list(APPEND INCLUDE_DIRS ${AD_MAP_OPENDRIVE_READER_INTERFACE_INCLUDE_DIRS})
 list(APPEND LIBRARIES ad_map_opendrive_reader)
 
-find_package(ad_physics 2.2.0 REQUIRED CONFIG)
+find_package(ad_physics 2.2.1 REQUIRED CONFIG)
 find_package(spdlog REQUIRED CONFIG)
 
 add_library(${PROJECT_NAME}

diff --git a/ad_map_access/generated/cmake/Config.cmake.in b/ad_map_access/generated/cmake/Config.cmake.in
@@ -30,7 +30,7 @@ get_target_property(AD_MAP_OPENDRIVE_READER_INTERFACE_INCLUDE_DIRS ad_map_opendr
 list(APPEND INCLUDE_DIRS ${AD_MAP_OPENDRIVE_READER_INTERFACE_INCLUDE_DIRS})
 list(APPEND LIBRARIES ad_map_opendrive_reader)
 
-find_dependency(ad_physics 2.2.0)
+find_dependency(ad_physics 2.2.1)
 find_dependency(spdlog)
 
 include("${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@Targets.cmake")

diff --git a/ad_map_access/generated/include/ad_map_access/Version.hpp b/ad_map_access/generated/include/ad_map_access/Version.hpp
@@ -30,9 +30,9 @@
 /*!
  * The revision of ad_map_access
  */
-#define AD_MAP_ACCESS_VERSION_REVISION 0
+#define AD_MAP_ACCESS_VERSION_REVISION 1
 
 /*!
  * The version of ad_map_access as string
  */
-#define AD_MAP_ACCESS_VERSION_STRING "2.2.0"
+#define AD_MAP_ACCESS_VERSION_STRING "2.2.1"
diff --git a/ad_map_access/impl/include/ad/map/route/RoutePrediction.hpp b/ad_map_access/impl/include/ad/map/route/RoutePrediction.hpp
@@ -106,7 +106,8 @@ class RoutePrediction : public RouteExpander<RoutePredictionScore>
     //! comparing route tree elements by their actual route-point to ensure children are unique
     struct RouteTreeElementCompare
     {
-      bool operator()(const std::shared_ptr<RouteTreeElement> &left, const std::shared_ptr<RouteTreeElement> &right)
+      bool operator()(const std::shared_ptr<RouteTreeElement> &left,
+                      const std::shared_ptr<RouteTreeElement> &right) const
       {
         return left->routingPoint.first < right->routingPoint.first;
       }

diff --git a/ad_map_access/impl/src/route/RouteAStar.cpp b/ad_map_access/impl/src/route/RouteAStar.cpp
@@ -106,7 +106,7 @@ bool RouteAstar::calculate()
     // sort the routing points by the smallest total cost
     struct FScoreCompare
     {
-      bool operator()(RoutingPoint const &left, RoutingPoint const &right)
+      bool operator()(RoutingPoint const &left, RoutingPoint const &right) const
       {
         return left.second.costData.estimatedDistanceToTarget < right.second.costData.estimatedDistanceToTarget;
       }

diff --git a/ad_map_access_test_support/generated/CMakeLists.txt b/ad_map_access_test_support/generated/CMakeLists.txt
@@ -14,7 +14,7 @@
 ##
 
 cmake_minimum_required(VERSION 3.5)
-project(ad_map_access_test_support VERSION 2.2.0)
+project(ad_map_access_test_support VERSION 2.2.1)
 
 include(GNUInstallDirs)
 include(CMakePackageConfigHelpers)
@@ -31,7 +31,7 @@ if ((NOT ad_map_access_test_support_SOURCES) OR (NOT ad_map_access_test_support_
   message(FATAL_ERROR "${PROJECT_NAME}: Variable ad_map_access_test_support_SOURCES or ad_map_access_test_support_INCLUDE_DIRS pointing to the generator managed library not set!")
 endif()
 
-find_package(ad_map_access 2.2.0 REQUIRED CONFIG)
+find_package(ad_map_access 2.2.1 REQUIRED CONFIG)
 
 add_library(${PROJECT_NAME}
   ${ad_map_access_test_support_SOURCES}

diff --git a/ad_map_access_test_support/generated/cmake/Config.cmake.in b/ad_map_access_test_support/generated/cmake/Config.cmake.in
@@ -17,7 +17,7 @@
 
 include(CMakeFindDependencyMacro)
 
-find_dependency(ad_map_access 2.2.0)
+find_dependency(ad_map_access 2.2.1)
 
 include("${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@Targets.cmake")
 

diff --git a/ad_map_access_test_support/generated/include/ad_map_access_test_support/Version.hpp b/ad_map_access_test_support/generated/include/ad_map_access_test_support/Version.hpp
@@ -30,9 +30,9 @@
 /*!
  * The revision of ad_map_access_test_support
  */
-#define AD_MAP_ACCESS_TEST_SUPPORT_VERSION_REVISION 0
+#define AD_MAP_ACCESS_TEST_SUPPORT_VERSION_REVISION 1
 
 /*!
  * The version of ad_map_access_test_support as string
  */
-#define AD_MAP_ACCESS_TEST_SUPPORT_VERSION_STRING "2.2.0"
+#define AD_MAP_ACCESS_TEST_SUPPORT_VERSION_STRING "2.2.1"
diff --git a/ad_map_opendrive_reader/include/opendrive/types.hpp b/ad_map_opendrive_reader/include/opendrive/types.hpp
@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2017 Computer Vision Center (CVC) at the Universitat Autonoma
  * de Barcelona (UAB).
- * Copyright (C) 2019 Intel Corporation
+ * Copyright (C) 2019-2020 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -281,8 +281,8 @@ struct LaneInfo
 
 struct LaneSection
 {
-  double start_position;
-  double end_position; // extended value
+  double start_position{0.};
+  double end_position{0.}; // extended value
   std::vector<LaneInfo> left, center, right;
 };
 
@@ -389,6 +389,8 @@ struct RoadLinkInformation
 
   RoadLinkInformation()
     : id(-1)
+    , element_type(ElementType::Invalid)
+    , contact_point(ContactPoint::Invalid)
   {
   }
 };

diff --git a/ad_map_opendrive_reader/src/parser/LaneParser.cpp b/ad_map_opendrive_reader/src/parser/LaneParser.cpp
@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2017 Computer Vision Center (CVC) at the Universitat Autonoma
  * de Barcelona (UAB).
- * Copyright (C) 2019 Intel Corporation
+ * Copyright (C) 2019-2020 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -248,6 +248,8 @@ void LaneParser::Parse(const pugi::xml_node &xmlNode, Lanes &out_lanes)
   {
     LaneSection laneSec;
     laneSec.start_position = std::stod(laneSection.attribute("s").value());
+    // until we know more, we set end to start
+    laneSec.end_position = laneSec.start_position;
 
     pugi::xml_node lane = laneSection.child("left");
     laneParser.ParseLane(lane, laneSec.left);

diff --git a/ad_physics/generated/CMakeLists.txt b/ad_physics/generated/CMakeLists.txt
@@ -14,7 +14,7 @@
 ##
 
 cmake_minimum_required(VERSION 3.5)
-project(ad_physics VERSION 2.2.0)
+project(ad_physics VERSION 2.2.1)
 
 include(GNUInstallDirs)
 include(CMakePackageConfigHelpers)

diff --git a/ad_physics/generated/include/ad_physics/Version.hpp b/ad_physics/generated/include/ad_physics/Version.hpp
@@ -30,9 +30,9 @@
 /*!
  * The revision of ad_physics
  */
-#define AD_PHYSICS_VERSION_REVISION 0
+#define AD_PHYSICS_VERSION_REVISION 1
 
 /*!
  * The version of ad_physics as string
  */
-#define AD_PHYSICS_VERSION_STRING "2.2.0"
+#define AD_PHYSICS_VERSION_STRING "2.2.1"
diff --git a/cmake/python/python_wrapper_helper.py b/cmake/python/python_wrapper_helper.py
@@ -15,6 +15,8 @@
 
 import fileinput
 
+import warnings
+
 
 def get_list_of_files(directory, ignore_files):
     """
@@ -61,6 +63,8 @@ def generate_python_wrapper(header_directories, include_paths, library_name, cpp
     :return:
     """
 
+    warnings.filterwarnings(action="once", category=DeprecationWarning)
+
     # Find out the xml generator (gccxml or castxml)
     generator_path, generator_name = utils.find_xml_generator()
     compiler = "g++"

diff --git a/doc/CHANGELOG.md b/doc/CHANGELOG.md
@@ -1,5 +1,10 @@
 ## Latest changes
 
+## Release 2.2.1
+#### :ghost: Maintenance
+* Fix build with C++ 17
+* Suppressed python code generation build output
+
 ## Release 2.2.0
 #### :ghost: Maintenance
 * Fix build of unit tests under Ubuntu18.04 with gcc 7.5.0