Work around stlport build bug.

Older versions of Android using stlport were failing to compile with an "assert has been defined before inclusion of assert.h header" error. Change-Id: If8e13eb08c35a34d082d99f8f57188bc55697f59 Reviewed-on: https://swiftshader-review.googlesource.com/11270Tested-by: Nicolas Capens <nicolascapens@google.com> Reviewed-by: Alexis Hétu <sugoi@google.com> Reviewed-by: Nicolas Capens <nicolascapens@google.com>

Work around stlport build bug.
4dd1eff4 · Nicolas Capens · Nicolas Capens · 99cb565a · 4dd1eff4 · 4dd1eff4
Commit 4dd1eff4 authored Aug 04, 2017 by Nicolas Capens Committed by Nicolas Capens Aug 04, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

DebugAndroid.hpp src/Common/DebugAndroid.hpp +1 -0

Reactor.hpp src/Reactor/Reactor.hpp +1 -1

No files found.
--- a/src/Common/DebugAndroid.hpp
+++ b/src/Common/DebugAndroid.hpp
@@ -16,6 +16,7 @@
 #define DebugAndroid_hpp

 #include <cutils/log.h>
+#include <cassert>

 // On Android Virtual Devices we heavily depend on logging, even in
 // production builds. We do this because AVDs are components of larger

--- a/src/Reactor/Reactor.hpp
+++ b/src/Reactor/Reactor.hpp
@@ -18,7 +18,7 @@
 #include "Nucleus.hpp"
 #include "Routine.hpp"

-#include <assert.h>
+#include <cassert>
 #include <cstddef>
 #include <cwchar>
 #undef Bool