[downward] patching to fix std::vector namespace

jsk-ros-pkg · Nov 13, 2024 · e80e23e · e80e23e
1 parent e9cdcb6
commit e80e23e
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/3rdparty/downward/CMakeLists.txt b/3rdparty/downward/CMakeLists.txt
@@ -14,7 +14,7 @@ externalproject_add(downward
   URL http://cdn.rawgit.com/jsk-ros-pkg/archives/master/Fast-Downward-f33d3b65601f.tar.gz
   TIMEOUT 120
   CONFIGURE_COMMAND ""
-  BUILD_COMMAND cd src && sed -i "s@^CXXFLAGS =$@CXXFLAGS = ${CXXFLAGS_NOETIC} -Wno-maybe-uninitialized@" search/Makefile && ./build_all DOWNWARD_BITWIDTH=native && patch -p3 < ${PROJECT_SOURCE_DIR}/fix_time_clock.patch
+  BUILD_COMMAND cd src && sed -i "s@^CXXFLAGS =$@CXXFLAGS = ${CXXFLAGS_NOETIC} -Wno-maybe-uninitialized@" search/Makefile && patch -p3 < ${PROJECT_SOURCE_DIR}/fix_std_vector_namespace.patch && ./build_all DOWNWARD_BITWIDTH=native && patch -p3 < ${PROJECT_SOURCE_DIR}/fix_time_clock.patch
   INSTALL_COMMAND bash -c "cp -rf --parents src/{validate,plan,preprocess/preprocess,search/downward*,search/unitcost,search/portfolio.py,translate} ${CATKIN_DEVEL_PREFIX}/${CATKIN_PACKAGE_SHARE_DESTINATION}"
   BUILD_IN_SOURCE 1
 )

diff --git a/3rdparty/downward/fix_std_vector_namespace.patch b/3rdparty/downward/fix_std_vector_namespace.patch
@@ -0,0 +1,10 @@
+--- src/downward/src/search/landmarks/landmark_factory_zhu_givan.h.bak	2024-11-13 13:20:10.508657847 +0900
++++ src/downward/src/search/landmarks/landmark_factory_zhu_givan.h	2024-11-13 13:20:12.591485789 +0900
+@@ -7,6 +7,7 @@
+ #include "../globals.h"
+
+ using namespace __gnu_cxx;
++using std::vector;
+
+ class LandmarkFactoryZhuGivan : public LandmarkFactory {
+ private: