Drop old C++ standard (#73)

* Add patch for new log4cxx * encode spaces for compatibility with CURL 7.78+ (#1) --------- Co-authored-by: Leopold Palomo-Avellaneda <[email protected]> Co-authored-by: Simon Schmeisser <[email protected]>
ros · Apr 12, 2024 · 59afd3b · 59afd3b
1 parent 65b0d22
commit 59afd3b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,8 +1,6 @@
 cmake_minimum_required(VERSION 3.0.2)
 project(resource_retriever)
 
-set_directory_properties(PROPERTIES COMPILE_OPTIONS "-std=c++11")
-
 find_package(catkin REQUIRED COMPONENTS rosconsole roslib)
 
 find_package(Boost REQUIRED)

diff --git a/src/retriever.cpp b/src/retriever.cpp
@@ -34,6 +34,8 @@
 
 #include <curl/curl.h>
 
+#include <regex>
+
 namespace resource_retriever
 {
 
@@ -118,6 +120,9 @@ MemoryResource Retriever::get(const std::string& url)
 
     mod_url = "file://" + package_path + mod_url;
   }
+
+  //newer versions of curl do not accept spaces in URLs
+  mod_url = std::regex_replace(mod_url, std::regex(" "), "%20");
 
   curl_easy_setopt(curl_handle_, CURLOPT_URL, mod_url.c_str());
   curl_easy_setopt(curl_handle_, CURLOPT_WRITEFUNCTION, curlWriteFunc);