Merge pull request #133 from nim65s/devel

Fix standard guard, fix #132
humanoid-path-planner · Sep 29, 2020 · 241719a · 241719a
2 parents 8d9e202 + 9be3027
commit 241719a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -59,7 +59,7 @@ ENDIF(CMAKE_BUILD_TYPE MATCHES "DEBUG")
 ADD_PROJECT_DEPENDENCY(Boost REQUIRED COMPONENTS thread)
 
 # Search for dependecies.
-ADD_PROJECT_DEPENDENCY(hpp-util REQUIRED PKG_CONFIG_REQUIRES "hpp-util >= 3.2")
+ADD_PROJECT_DEPENDENCY(hpp-util 4.10.0 REQUIRED PKG_CONFIG_REQUIRES "hpp-util >= 4.10.0")
 ADD_PROJECT_DEPENDENCY(pinocchio REQUIRED PKG_CONFIG_REQUIRES "pinocchio >= 2.1.10")
 ADD_PROJECT_DEPENDENCY(Eigen3 REQUIRED "eigen3 >= 3.2.92")
 

diff --git a/src/device.cc b/src/device.cc
@@ -535,7 +535,7 @@ namespace hpp {
 #endif
     }
 
-#if __cplusplus > 201103L
+#if __cplusplus >= 201103L
     using boost::serialization::make_nvp;
     using hpp::serialization::archive_device_wrapper;