Skip to content

Commit

Permalink
chore: Combine patches
Browse files Browse the repository at this point in the history
  • Loading branch information
krlmlr committed Jan 22, 2025
1 parent 1863569 commit e76dd10
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 38 deletions.
22 changes: 13 additions & 9 deletions patch/0006-Fix-uninitialized-warning.patch
Original file line number Diff line number Diff line change
@@ -1,24 +1,28 @@
From 8b297dc5efaf19bde1520f417e323aba0a3fbf92 Mon Sep 17 00:00:00 2001
From a2f61993d29d45a68b53ea3251dac675d890654e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kirill=20M=C3=BCller?= <[email protected]>
Date: Sun, 8 Dec 2024 06:34:40 +0100
Date: Wed, 22 Jan 2025 18:45:41 +0100
Subject: [PATCH] fix: Fix uninitialized warning

---
src/duckdb/src/main/connection.cpp | 1 +
1 file changed, 1 insertion(+)
src/duckdb/src/main/connection.cpp | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/duckdb/src/main/connection.cpp b/src/duckdb/src/main/connection.cpp
index 4dd7ad11..a08874fc 100644
index 4dd7ad11e..fe6fd7247 100644
--- a/src/duckdb/src/main/connection.cpp
+++ b/src/duckdb/src/main/connection.cpp
@@ -28,6 +28,7 @@ Connection::Connection(DatabaseInstance &database)
@@ -28,9 +28,10 @@ Connection::Connection(DatabaseInstance &database)
}

Connection::Connection(DuckDB &database) : Connection(*database.instance) {
+ warning_cb = nullptr;
+ // Initialization of warning_cb happens in the other constructor
}

Connection::Connection(Connection &&other) noexcept {
-Connection::Connection(Connection &&other) noexcept {
+Connection::Connection(Connection &&other) noexcept : warning_cb(nullptr) {
std::swap(context, other.context);
std::swap(warning_cb, other.warning_cb);
}
--
2.43.0
2.48.1

29 changes: 0 additions & 29 deletions patch/0007-Correctly-fix-uninitialized-warning.patch

This file was deleted.

0 comments on commit e76dd10

Please sign in to comment.