From 2b1fe748e351fcfdf0268310e87b3d0ae360dd23 Mon Sep 17 00:00:00 2001
From: Oscar Franco <ospfranco@gmail.com>
Date: Sun, 2 Feb 2025 11:06:48 +0100
Subject: [PATCH 1/2] Avoid collisions

---
 android/CMakeLists.txt                   | 2 +-
 cpp/DBHostObject.h                       | 3 ++-
 cpp/{ThreadPool.cpp => OPThreadPool.cpp} | 3 ++-
 cpp/{ThreadPool.h => OPThreadPool.h}     | 0
 cpp/PreparedStatementHostObject.h        | 3 ++-
 cpp/bindings.cpp                         | 3 ++-
 6 files changed, 9 insertions(+), 5 deletions(-)
 rename cpp/{ThreadPool.cpp => OPThreadPool.cpp} (98%)
 rename cpp/{ThreadPool.h => OPThreadPool.h} (100%)

diff --git a/android/CMakeLists.txt b/android/CMakeLists.txt
index da3508a..74f0d19 100644
--- a/android/CMakeLists.txt
+++ b/android/CMakeLists.txt
@@ -18,7 +18,7 @@ add_library(
   SHARED
   ../cpp/bindings.cpp
   ../cpp/utils.cpp
-  ../cpp/ThreadPool.cpp
+  ../cpp/OPThreadPool.cpp
   ../cpp/SmartHostObject.cpp
   ../cpp/PreparedStatementHostObject.cpp
   ../cpp/DumbHostObject.cpp
diff --git a/cpp/DBHostObject.h b/cpp/DBHostObject.h
index 3f703dc..555f038 100644
--- a/cpp/DBHostObject.h
+++ b/cpp/DBHostObject.h
@@ -1,6 +1,7 @@
 #pragma once
 
-#include "ThreadPool.h"
+#include "OPThreadPool.h"
+         "
 #include "types.h"
 #include <ReactCommon/CallInvoker.h>
 #include <jsi/jsi.h>
diff --git a/cpp/ThreadPool.cpp b/cpp/OPThreadPool.cpp
similarity index 98%
rename from cpp/ThreadPool.cpp
rename to cpp/OPThreadPool.cpp
index e91efaf..4d82410 100644
--- a/cpp/ThreadPool.cpp
+++ b/cpp/OPThreadPool.cpp
@@ -1,4 +1,5 @@
-#include "ThreadPool.h"
+#include "OPThreadPool.h"
+         "
 
 namespace opsqlite {
 
diff --git a/cpp/ThreadPool.h b/cpp/OPThreadPool.h
similarity index 100%
rename from cpp/ThreadPool.h
rename to cpp/OPThreadPool.h
diff --git a/cpp/PreparedStatementHostObject.h b/cpp/PreparedStatementHostObject.h
index 2e25514..7b60019 100644
--- a/cpp/PreparedStatementHostObject.h
+++ b/cpp/PreparedStatementHostObject.h
@@ -9,7 +9,8 @@
 #else
 #include <sqlite3.h>
 #endif
-#include "ThreadPool.h"
+#include "OPThreadPool.h"
+         "
 #include <string>
 #include <utility>
 
diff --git a/cpp/bindings.cpp b/cpp/bindings.cpp
index be51f85..f5307b0 100644
--- a/cpp/bindings.cpp
+++ b/cpp/bindings.cpp
@@ -1,7 +1,8 @@
 #include "bindings.h"
 #include "DBHostObject.h"
 #include "DumbHostObject.h"
-#include "ThreadPool.h"
+#include "OPThreadPool.h"
+         "
 #ifdef OP_SQLITE_USE_LIBSQL
 #include "libsql/bridge.h"
 #else

From ac6c08eeaaabeab6570fc6e79c8d7f6ad6bb91c3 Mon Sep 17 00:00:00 2001
From: Oscar Franco <ospfranco@gmail.com>
Date: Sun, 2 Feb 2025 11:09:18 +0100
Subject: [PATCH 2/2] Fix botched replace

---
 cpp/DBHostObject.h                | 1 -
 cpp/OPThreadPool.cpp              | 1 -
 cpp/PreparedStatementHostObject.h | 1 -
 cpp/bindings.cpp                  | 1 -
 4 files changed, 4 deletions(-)

diff --git a/cpp/DBHostObject.h b/cpp/DBHostObject.h
index 555f038..b665ddd 100644
--- a/cpp/DBHostObject.h
+++ b/cpp/DBHostObject.h
@@ -1,7 +1,6 @@
 #pragma once
 
 #include "OPThreadPool.h"
-         "
 #include "types.h"
 #include <ReactCommon/CallInvoker.h>
 #include <jsi/jsi.h>
diff --git a/cpp/OPThreadPool.cpp b/cpp/OPThreadPool.cpp
index 4d82410..323f905 100644
--- a/cpp/OPThreadPool.cpp
+++ b/cpp/OPThreadPool.cpp
@@ -1,5 +1,4 @@
 #include "OPThreadPool.h"
-         "
 
 namespace opsqlite {
 
diff --git a/cpp/PreparedStatementHostObject.h b/cpp/PreparedStatementHostObject.h
index 7b60019..985949c 100644
--- a/cpp/PreparedStatementHostObject.h
+++ b/cpp/PreparedStatementHostObject.h
@@ -10,7 +10,6 @@
 #include <sqlite3.h>
 #endif
 #include "OPThreadPool.h"
-         "
 #include <string>
 #include <utility>
 
diff --git a/cpp/bindings.cpp b/cpp/bindings.cpp
index f5307b0..3af52b2 100644
--- a/cpp/bindings.cpp
+++ b/cpp/bindings.cpp
@@ -2,7 +2,6 @@
 #include "DBHostObject.h"
 #include "DumbHostObject.h"
 #include "OPThreadPool.h"
-         "
 #ifdef OP_SQLITE_USE_LIBSQL
 #include "libsql/bridge.h"
 #else