Android + C++17 compatibility

APN-Pucky · Jun 26, 2019 · 9e4d03d · 9e4d03d
1 parent 4993429
commit 9e4d03d
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/tyrant.h b/tyrant.h
@@ -424,7 +424,7 @@ std::string to_string(const T val)
     return s.str();
 }
 
-inline uint8_t byte_bits_count(register uint8_t i)
+inline uint8_t byte_bits_count(uint8_t i)
 {
     i = i - ((i >> 1) & 0x55);
     i = (i & 0x33) + ((i >> 2) & 0x33);

diff --git a/tyrant_optimize.h b/tyrant_optimize.h
@@ -4,9 +4,17 @@
 #include <iostream>
 #include <boost/thread/thread.hpp>
 #include <chrono>
+// OpenMP Header
+#ifdef _OPENMP
+#include <omp.h>
+#endif
+// Android Headers
+#if defined(ANDROID) || defined(__ANDROID__)
+#include <jni.h>
+#include <android/log.h>
+#endif
 //------------------------------------------------------------------------------
 
-
 struct Requirement
 {
 	std::unordered_map<const Card*, unsigned> num_cards;