Skip to content

Commit

Permalink
fix anroid build issue by remove the crossplt name space before andro…
Browse files Browse the repository at this point in the history
…id parameters (#959)
  • Loading branch information
zixincheng authored and BillyONeal committed Nov 7, 2018
1 parent 4c3edd6 commit 7467b79
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions Release/src/pplx/threadpool.cpp
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

0 comments on commit 7467b79

Please sign in to comment.