Merge pull request #11356 from kindred77/master-fix-build-issue-on-wi…

…n32-remove-unnecessary-modification Fix building issues in WIN32, remove unnecessary modification.
duckdb · Mar 28, 2024 · 9b8e5b6 · 9b8e5b6
2 parents d4c2eca + 4f41240
commit 9b8e5b6
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/src/function/scalar/compressed_materialization/compress_string.cpp b/src/function/scalar/compressed_materialization/compress_string.cpp
@@ -11,13 +11,13 @@ static string StringCompressFunctionName(const LogicalType &result_type) {
 }
 
 template <idx_t LENGTH>
-static inline void TemplatedReverseMemCpy(const data_ptr_t __restrict &dest, const const_data_ptr_t __restrict &src) {
+static inline void TemplatedReverseMemCpy(const data_ptr_t &__restrict dest, const const_data_ptr_t &__restrict src) {
 	for (idx_t i = 0; i < LENGTH; i++) {
 		dest[i] = src[LENGTH - 1 - i];
 	}
 }
 
-static inline void ReverseMemCpy(const data_ptr_t __restrict &dest, const const_data_ptr_t __restrict &src,
+static inline void ReverseMemCpy(const data_ptr_t &__restrict dest, const const_data_ptr_t &__restrict src,
                                  const idx_t &length) {
 	for (idx_t i = 0; i < length; i++) {
 		dest[i] = src[length - 1 - i];

diff --git a/src/function/scalar/strftime_format.cpp b/src/function/scalar/strftime_format.cpp
@@ -5,6 +5,7 @@
 #include "duckdb/common/types/date.hpp"
 #include "duckdb/common/types/time.hpp"
 #include "duckdb/common/types/timestamp.hpp"
+#include <cctype>
 
 namespace duckdb {
 

diff --git a/src/include/duckdb/common/types/string_type.hpp b/src/include/duckdb/common/types/string_type.hpp
@@ -14,6 +14,7 @@
 #include "duckdb/common/numeric_utils.hpp"
 
 #include <cstring>
+#include <algorithm>
 
 namespace duckdb {