Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix Android build issue by removing the (now removed) crossplat name space qualification #959

Merged
merged 1 commit into from
Nov 7, 2018
Merged

Fix Android build issue by removing the (now removed) crossplat name space qualification #959

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Release/src/pplx/threadpool.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,15 +84,15 @@ struct threadpool_impl final : crossplat::threadpool
#if defined(__ANDROID__)
static void detach_from_java(void*)
{
crossplat::JVM.load()->DetachCurrentThread();
JVM.load()->DetachCurrentThread();
}
#endif // __ANDROID__

static void* thread_start(void *arg) CPPREST_NOEXCEPT
{
#if defined(__ANDROID__)
// Calling get_jvm_env() here forces the thread to be attached.
crossplat::get_jvm_env();
get_jvm_env();
pthread_cleanup_push(detach_from_java, nullptr);
#endif // __ANDROID__
threadpool_impl* _this = reinterpret_cast<threadpool_impl*>(arg);
Expand Down Expand Up @@ -197,7 +197,7 @@ void threadpool::initialize_with_threads(size_t num_threads)

#if defined(__ANDROID__)
void cpprest_init(JavaVM* vm) {
crossplat::JVM = vm;
JVM = vm;
}
#endif

Expand Down