bde tmp

microsoft · Oct 17, 2024 · d21d1d8 · d21d1d8
1 parent e3157a0
commit d21d1d8
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 13 deletions.
diff --git a/ports/redis-plus-plus/fix-absolute-path.patch b/ports/redis-plus-plus/fix-absolute-path.patch
@@ -1,13 +1,13 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index a075aca..8657ef7 100644
+index c329f9b..785ca3c 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -168,7 +168,7 @@ set(CMAKE_REQUIRED_LIBRARIES ${HIREDIS_FEATURE_TEST_LIB})
-
+@@ -180,7 +180,7 @@ set(CMAKE_REQUIRED_LIBRARIES ${HIREDIS_FEATURE_TEST_LIB})
  CHECK_SYMBOL_EXISTS(redisEnableKeepAliveWithInterval ${HIREDIS_FEATURE_TEST_HEADER} REDIS_PLUS_PLUS_HAS_redisEnableKeepAliveWithInterval)
 
--configure_file(${CMAKE_CURRENT_SOURCE_DIR}/hiredis_features.h.in ${CMAKE_CURRENT_SOURCE_DIR}/${REDIS_PLUS_PLUS_SOURCE_DIR}/hiredis_features.h)
-+configure_file("${CMAKE_CURRENT_SOURCE_DIR}/hiredis_features.h.in" "${CMAKE_CURRENT_SOURCE_DIR}/${REDIS_PLUS_PLUS_SOURCE_DIR}/hiredis_features.h")
+ set(REDIS_PLUS_PLUS_GENERATED_HEADER_DIR ${CMAKE_CURRENT_BINARY_DIR}/${REDIS_PLUS_PLUS_HEADER_DIR})
+-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/hiredis_features.h.in ${CMAKE_CURRENT_BINARY_DIR}/${REDIS_PLUS_PLUS_SOURCE_DIR}/hiredis_features.h)
++configure_file("${CMAKE_CURRENT_SOURCE_DIR}/hiredis_features.h.in" "${CMAKE_CURRENT_BINARY_DIR}/${REDIS_PLUS_PLUS_SOURCE_DIR}/hiredis_features.h")
 
  # Restore CMAKE_REQUIRED_LIBRARIES
  set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES_BACK})
diff --git a/ports/redis-plus-plus/fix-conversion.patch b/ports/redis-plus-plus/fix-conversion.patch
@@ -1,13 +1,13 @@
 diff --git a/src/sw/redis++/shards.cpp b/src/sw/redis++/shards.cpp
-index c5baf5a..08e96cd 100644
+index fc58eea..ea57266 100644
 --- a/src/sw/redis++/shards.cpp
 +++ b/src/sw/redis++/shards.cpp
-@@ -41,7 +41,7 @@ std::pair<Slot, Node> RedirectionError::_parse_error(const std::string &msg) con
+@@ -42,7 +42,7 @@ std::pair<Slot, Node> RedirectionError::_parse_error(const std::string &msg) con
          auto host = msg.substr(space_pos + 1, colon_pos - space_pos - 1);
          auto port = std::stoi(msg.substr(colon_pos + 1));
 
 -        return {slot, {host, port}};
 +        return {static_cast<std::size_t>(slot), {host, port}};
-     } catch (const std::exception &e) {
-         throw ProtoError("Invalid ASK error message: " + msg);
+     } catch (const std::exception &) {
+         throw ProtoError("invalid redirection error message: " + msg);
      }
diff --git a/ports/redis-plus-plus/fix-dependency-libuv.patch b/ports/redis-plus-plus/fix-dependency-libuv.patch
@@ -1,8 +1,8 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index e85a158..e67681c 100644
+index ae2507e..c329f9b 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -30,8 +30,8 @@ if(REDIS_PLUS_PLUS_BUILD_ASYNC)
+@@ -45,8 +45,8 @@ if(REDIS_PLUS_PLUS_BUILD_ASYNC)
          message(STATUS "redis-plus-plus build async interface with libuv")
 
          # libuv dependency
@@ -13,7 +13,7 @@ index e85a158..e67681c 100644
      else()
          message(FATAL_ERROR "invalid REDIS_PLUS_PLUS_BUILD_ASYNC")
      endif()
-@@ -150,7 +150,6 @@ if(REDIS_PLUS_PLUS_BUILD_STATIC)
+@@ -228,7 +228,6 @@ if(REDIS_PLUS_PLUS_BUILD_STATIC)
 
      if(REDIS_PLUS_PLUS_BUILD_ASYNC)
          target_include_directories(${STATIC_LIB} PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/${REDIS_PLUS_PLUS_ASYNC_FUTURE_HEADER}>)

diff --git a/versions/r-/redis-plus-plus.json b/versions/r-/redis-plus-plus.json
@@ -1,7 +1,7 @@
 {
   "versions": [
     {
-      "git-tree": "b71d9c749dee1f0c35069eb08e871ab34740690f",
+      "git-tree": "91fb6d6b9e220a2a75c0df8572ef980fc2313dab",
       "version-semver": "1.3.13",
       "port-version": 0
     },