Skip to content

Commit

Permalink
Merge pull request #240 from OP-Engineering/oscar/rename-threadpool-t…
Browse files Browse the repository at this point in the history
…o-opthreadpool

Avoid collisions with ThreadPool
  • Loading branch information
ospfranco authored Feb 2, 2025
2 parents 109792f + ac6c08e commit 2f0eb7e
Show file tree
Hide file tree
Showing 6 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion android/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion cpp/DBHostObject.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#pragma once

#include "ThreadPool.h"
#include "OPThreadPool.h"
#include "types.h"
#include <ReactCommon/CallInvoker.h>
#include <jsi/jsi.h>
Expand Down
2 changes: 1 addition & 1 deletion cpp/ThreadPool.cpp → cpp/OPThreadPool.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "ThreadPool.h"
#include "OPThreadPool.h"

namespace opsqlite {

Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion cpp/PreparedStatementHostObject.h
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
#else
#include <sqlite3.h>
#endif
#include "ThreadPool.h"
#include "OPThreadPool.h"
#include <string>
#include <utility>

Expand Down
2 changes: 1 addition & 1 deletion cpp/bindings.cpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#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
Expand Down

0 comments on commit 2f0eb7e

Please sign in to comment.