duckdb 1.3.1-dev6.0 → 1.3.1

package/src/duckdb/third_party/re2/re2/set.cc

@@ -137,7 +137,7 @@ bool RE2::Set::Match(const StringPiece& text, std::vector<int>* v,
   hooks::context = NULL;
 #endif
   bool dfa_failed = false;
-  std::unique_ptr<SparseSet> matches;
+  duckdb_base_std::unique_ptr<SparseSet> matches;
   if (v != NULL) {
     matches.reset(new SparseSet(size_));
     v->clear();

package/src/duckdb/third_party/re2/re2/set.h

@@ -12,6 +12,12 @@
 
 #include "re2/re2.h"
 
+#ifndef DUCKDB_BASE_STD
+namespace duckdb_base_std {
+	using ::std::unique_ptr;
+} // namespace duckdb_base_std
+#endif
+
 namespace duckdb_re2 {
 class Prog;
 class Regexp;
@@ -77,7 +83,7 @@ class RE2::Set {
   std::vector<Elem> elem_;
   bool compiled_;
   int size_;
-  std::unique_ptr<duckdb_re2::Prog> prog_;
+  duckdb_base_std::unique_ptr<duckdb_re2::Prog> prog_;
 };
 
 }  // namespace re2

package/src/duckdb/ub_src_logging.cpp

@@ -1,10 +1,10 @@
-#include "src/logging/logger.cpp"
-
 #include "src/logging/log_manager.cpp"
 
 #include "src/logging/log_storage.cpp"
 
-#include "src/logging/logging.cpp"
-
 #include "src/logging/log_types.cpp"
 
+#include "src/logging/logger.cpp"
+
+#include "src/logging/logging.cpp"
+