Merge pull request #872 from leapmotion/fix-android32-gcc4.9

future is only supported by android64 gcc 4.9
leapmotion · Apr 2, 2016 · 0da1f0b · 0da1f0b
2 parents 47ca9e7 + 203af67
commit 0da1f0b
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/autowiring/C++11/cpp11.h b/src/autowiring/C++11/cpp11.h
@@ -127,7 +127,7 @@
 /*********************
  * future availability
  *********************/
-#if (_MSC_VER >= 1700 || (STL11_ALLOWED)) && (!__ANDROID__ || GCC_CHECK(4, 9))
+#if (_MSC_VER >= 1700 || (STL11_ALLOWED)) && (!__ANDROID__ || (GCC_CHECK(4, 9) && __aarch64__))
   #define FUTURE_HEADER <future>
 #else
   // As of NDK r10, we still don't have an implementation of "future" for Android