Skip to content

Commit 2f0eb7e

Browse files
authored
Merge pull request #240 from OP-Engineering/oscar/rename-threadpool-to-opthreadpool
Avoid collisions with ThreadPool
2 parents 109792f + ac6c08e commit 2f0eb7e

File tree

6 files changed

+5
-5
lines changed

6 files changed

+5
-5
lines changed

android/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ add_library(
1818
SHARED
1919
../cpp/bindings.cpp
2020
../cpp/utils.cpp
21-
../cpp/ThreadPool.cpp
21+
../cpp/OPThreadPool.cpp
2222
../cpp/SmartHostObject.cpp
2323
../cpp/PreparedStatementHostObject.cpp
2424
../cpp/DumbHostObject.cpp

cpp/DBHostObject.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#pragma once
22

3-
#include "ThreadPool.h"
3+
#include "OPThreadPool.h"
44
#include "types.h"
55
#include <ReactCommon/CallInvoker.h>
66
#include <jsi/jsi.h>

cpp/ThreadPool.cpp renamed to cpp/OPThreadPool.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#include "ThreadPool.h"
1+
#include "OPThreadPool.h"
22

33
namespace opsqlite {
44

File renamed without changes.

cpp/PreparedStatementHostObject.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
#else
1010
#include <sqlite3.h>
1111
#endif
12-
#include "ThreadPool.h"
12+
#include "OPThreadPool.h"
1313
#include <string>
1414
#include <utility>
1515

cpp/bindings.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#include "bindings.h"
22
#include "DBHostObject.h"
33
#include "DumbHostObject.h"
4-
#include "ThreadPool.h"
4+
#include "OPThreadPool.h"
55
#ifdef OP_SQLITE_USE_LIBSQL
66
#include "libsql/bridge.h"
77
#else

0 commit comments

Comments
 (0)