futher Future and threading code removed (#if FUTURE_ENABLED)

Author: danielweck

ePub3/ePub/filter_chain.h

@@ -23,15 +23,18 @@
 
 #include <ePub3/epub3.h>
 #include <ePub3/utilities/byte_stream.h>
-#include <ePub3/utilities/run_loop.h>
-#include <ePub3/utilities/executor.h>
 #include <ePub3/utilities/byte_buffer.h>
 #include <memory>
-#include <thread>
-#include <condition_variable>
 #include <algorithm>
 #include <utility>
 
+#if FUTURE_ENABLED
+#include <thread>
+#include <condition_variable>
+#include <ePub3/utilities/run_loop.h>
+#include <ePub3/utilities/executor.h>
+#endif //FUTURE_ENABLED
+
 #include <ePub3/filter.h>
 //#include <ePub3/filter_chain_byte_stream.h>
 //#include <ePub3/filter_chain_byte_stream_range.h>

ePub3/ePub/filter_chain_byte_stream.h

@@ -23,15 +23,18 @@
 
 #include <ePub3/epub3.h>
 #include <ePub3/utilities/byte_stream.h>
-#include <ePub3/utilities/run_loop.h>
-#include <ePub3/utilities/executor.h>
 #include <ePub3/utilities/byte_buffer.h>
 #include <memory>
-#include <thread>
-#include <condition_variable>
 #include <algorithm>
 #include <utility>
 
+#if FUTURE_ENABLED
+#include <thread>
+#include <condition_variable>
+#include <ePub3/utilities/run_loop.h>
+#include <ePub3/utilities/executor.h>
+#endif //FUTURE_ENABLED
+
 #include <ePub3/filter.h>
 
 EPUB3_BEGIN_NAMESPACE

ePub3/ePub/filter_chain_byte_stream_range.h

@@ -23,15 +23,18 @@
 
 #include <ePub3/epub3.h>
 #include <ePub3/utilities/byte_stream.h>
-#include <ePub3/utilities/run_loop.h>
-#include <ePub3/utilities/executor.h>
 #include <ePub3/utilities/byte_buffer.h>
 #include <memory>
-#include <thread>
-#include <condition_variable>
 #include <algorithm>
 #include <utility>
 
+#if FUTURE_ENABLED
+#include <thread>
+#include <condition_variable>
+#include <ePub3/utilities/run_loop.h>
+#include <ePub3/utilities/executor.h>
+#endif //FUTURE_ENABLED
+
 #include <ePub3/filter.h>
 
 EPUB3_BEGIN_NAMESPACE

ePub3/utilities/executor.cpp

@@ -18,6 +18,8 @@
 //  the License, or (at your option) any later version. You should have received a copy of the GNU 
 //  Affero General Public License along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+#if FUTURE_ENABLED
+
 #include "epub3.h"
 #include "executor.h"
 #include <iostream>
@@ -467,3 +469,6 @@ void __main_thread_executor::add_after(std::chrono::system_clock::duration& rel_
 #endif
 
 EPUB3_END_NAMESPACE
+
+#endif //FUTURE_ENABLED
+

ePub3/utilities/executor.h

@@ -21,6 +21,8 @@
 #ifndef __ePub3__executor__
 #define __ePub3__executor__
 
+#if FUTURE_ENABLED
+
 #include <ePub3/epub3.h>
 #include <functional>
 #include <chrono>
@@ -709,4 +711,6 @@ std::shared_ptr<executor> main_thread_executor();
 
 EPUB3_END_NAMESPACE
 
+#endif //FUTURE_ENABLED
+
 #endif /* defined(__ePub3__executor__) */

ePub3/utilities/future.cpp

@@ -24,6 +24,7 @@
 #include <system_error>
 #include "future.h"
 
+/*
 #if EPUB_PLATFORM(ANDROID)
 namespace std
 {
@@ -81,6 +82,21 @@ namespace std
     
 }
 #endif
+*/
+
+#if EPUB_COMPILER(CLANG) && defined(ANDROID)
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+int __cxa_thread_atexit(void (*func)(), void *obj,
+                                   void *dso_symbol) {
+  return 0;
+}
+#ifdef __cplusplus
+}
+#endif
+#endif
 
 EPUB3_BEGIN_NAMESPACE