Added _pplx_cdecl macro to silence attribute ignored warnings

Conflicts:
	Release/src/json/json_parsing.cpp

Author: casablanca

Release/include/pplx/pplx.h

@@ -85,12 +85,12 @@ namespace pplx
 /// <summary>
 /// Sets the ambient scheduler to be used by the PPL constructs.
 /// </summary>
-_PPLXIMP void __cdecl set_ambient_scheduler(std::shared_ptr<pplx::scheduler_interface> _Scheduler);
+_PPLXIMP void _pplx_cdecl set_ambient_scheduler(std::shared_ptr<pplx::scheduler_interface> _Scheduler);
 
 /// <summary>
 /// Gets the ambient scheduler to be used by the PPL constructs
 /// </summary>
-_PPLXIMP std::shared_ptr<pplx::scheduler_interface> __cdecl get_ambient_scheduler();
+_PPLXIMP std::shared_ptr<pplx::scheduler_interface> _pplx_cdecl get_ambient_scheduler();
 
 namespace details
 {
@@ -122,7 +122,7 @@ namespace details
         virtual ~_TaskProcHandle() {}
         virtual void invoke() const = 0;
 
-        static void __cdecl _RunChoreBridge(void * _Parameter)
+        static void _pplx_cdecl _RunChoreBridge(void * _Parameter)
         {
             auto _PTaskHandle = static_cast<_TaskProcHandle *>(_Parameter);
             _AutoDeleter<_TaskProcHandle> _AutoDeleter(_PTaskHandle);
@@ -207,7 +207,7 @@ namespace details
             }
         }
 
-        static bool __cdecl _Is_cancellation_requested()
+        static bool _pplx_cdecl _Is_cancellation_requested()
         {
             // We do not yet have the ability to determine the current task. So return false always
             return false;

Release/include/pplx/pplxinterface.h

@@ -48,6 +48,13 @@
 #include <atomic>
 #endif
 
+#if defined(ANDROID)
+// This prevents users from requiring -Wno-attributes when using gcc-4.8 with the android NDK.
+#define _pplx_cdecl
+#else
+#define _pplx_cdecl __cdecl
+#endif
+
 namespace pplx
 {
 
@@ -56,7 +63,7 @@ namespace pplx
 ///     invoke the body of a task.
 /// </summary>
 /**/
-typedef void (__cdecl * TaskProc_t)(void *);
+typedef void (_pplx_cdecl * TaskProc_t)(void *);
 
 /// <summary>
 ///     Scheduler Interface

Release/include/pplx/pplxlinux.h

@@ -65,12 +65,12 @@ namespace platform
     /// <summary>
     /// Returns a unique identifier for the execution thread where this routine in invoked
     /// </summary>
-    _PPLXIMP long __cdecl GetCurrentThreadId();
+    _PPLXIMP long _pplx_cdecl GetCurrentThreadId();
 
     /// <summary>
     /// Yields the execution of the current execution thread - typically when spin-waiting
     /// </summary>
-    _PPLXIMP void __cdecl YieldExecution();
+    _PPLXIMP void _pplx_cdecl YieldExecution();
 
     /// <summary>
     /// Caputeres the callstack

Release/include/pplx/pplxtasks.h

@@ -201,7 +201,7 @@ template <> class task<void>;
 /// <seealso cref="cancellation_token Class"/>
 /// <seealso cref="cancel_current_task Function"/>
 /**/
-inline bool __cdecl is_task_cancellation_requested()
+inline bool _pplx_cdecl is_task_cancellation_requested()
 {
     return ::pplx::details::_TaskCollection_t::_Is_cancellation_requested();
 }
@@ -216,7 +216,7 @@ inline bool __cdecl is_task_cancellation_requested()
 /// </summary>
 /// <seealso cref="task Class"/>
 /**/
-inline __declspec(noreturn) void __cdecl cancel_current_task()
+inline __declspec(noreturn) void _pplx_cdecl cancel_current_task()
 {
     throw task_canceled();
 }
@@ -506,7 +506,7 @@ namespace details
         {
         }
 
-        static void __cdecl _Bridge(void *_PData)
+        static void _pplx_cdecl _Bridge(void *_PData)
         {
             _TaskProcThunk *_PThunk = reinterpret_cast<_TaskProcThunk *>(_PData);
             _Holder _ThunkHolder(_PThunk);

Release/src/json/json_parsing.cpp

@@ -29,18 +29,6 @@
 #include <vector>
 #include <cstdlib>
 
-#if defined(ANDROID)
-
-namespace crossplat
-{
-// These two are initialized in threadpool.cpp
-// HACK: This uses silently shared global variables. Revisit in the future if android
-//       JNI code gets its own header and cpp file.
-extern jmethodID java_parseDouble;
-extern jclass java_lang_double;
-}
-#endif
-
 #pragma warning(disable : 4127) // allow expressions like while(true) pass 
 using namespace web;
 using namespace web::json;
@@ -405,44 +393,8 @@ namespace
     }
 #endif
 
-#ifdef ANDROID
-    static double anystod(const char* str)
-    {
-        // HACK: To work around issues with bionic's strtod() implementation, we ship
-        //       the string to parse into java, call the java function
-        //       java.lang.Double.parseDouble(), and bring it back down to native code.
-        //
-        // The strtod() bug causes problems when parsing large strings; furthermore, it
-        // is arguable that it uses "locale" information, which is announced as being
-        // off-limits for native code.
-        //
-        // It is highly unlikely this situation will be remedied due to ecosystem
-        // fragmentation.
-        if (str == nullptr)
-            str = "";
-
-        auto env = crossplat::get_jvm_env();
-
-        jdouble parsed_double;
-
-        crossplat::java_local_ref<jstring> jstr{env->NewStringUTF(str)};
-        parsed_double = env->CallStaticDoubleMethod(crossplat::java_lang_double,
-                                                    crossplat::java_parseDouble,
-                                                    jstr.get());
-
-        jthrowable exc = env->ExceptionOccurred();
-        if (exc)
-        {
-            env->ExceptionClear();
-            throw exc;
-        }
-        return parsed_double;
-    }
-
-#else
     static double anystod(const char* str) { return strtod(str, nullptr); }
     static double anystod(const wchar_t* str) { return wcstod(str, nullptr); }
-#endif
 }
 
 template <typename CharType>

Release/src/pplx/pplx.cpp

@@ -144,12 +144,12 @@ static struct _pplx_g_sched_t
     sched_ptr m_scheduler;
 } _pplx_g_sched;
 
-_PPLXIMP std::shared_ptr<pplx::scheduler_interface> __cdecl get_ambient_scheduler()
+_PPLXIMP std::shared_ptr<pplx::scheduler_interface> _pplx_cdecl get_ambient_scheduler()
 {
     return _pplx_g_sched.get_scheduler();
 }
 
-_PPLXIMP void __cdecl set_ambient_scheduler(std::shared_ptr<pplx::scheduler_interface> _Scheduler)
+_PPLXIMP void _pplx_cdecl set_ambient_scheduler(std::shared_ptr<pplx::scheduler_interface> _Scheduler)
 {
     _pplx_g_sched.set_scheduler(std::move(_Scheduler));
 }

Release/src/pplx/threadpool.cpp

@@ -46,8 +46,6 @@ JNIEnv* get_jvm_env()
     return JVM_ENV;
 }
 
-jmethodID java_parseDouble;
-jclass java_lang_double;
 #endif
 
 }
@@ -61,11 +59,6 @@ extern "C" jint JNI_OnLoad(JavaVM* vm, void* reserved)
       return -1;
    }
 
-   crossplat::java_local_ref<jclass> local_java_lang_double{env->FindClass("java/lang/Double")};
-   crossplat::java_lang_double = static_cast<jclass>(env->NewGlobalRef(local_java_lang_double.get()));
-
-   crossplat::java_parseDouble = env->GetStaticMethodID(crossplat::java_lang_double, "parseDouble", "(Ljava/lang/String;)D");
-
    crossplat::JVM = vm;
    return JNI_VERSION_1_6;
 }