commit 4dd1eff4e91ca076325eb224dc248b4acced3ff1
author Nicolas Capens <capn@google.com> Fri Aug 04 09:33:04 2017 -0400
committer Nicolas Capens <nicolascapens@google.com> Fri Aug 04 15:02:05 2017 +0000
tree 6e269f19dcffd885ac6269d5fc8b4968b36f033e
parent 99cb565a849193630e9850672b6477944da7f8aa

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/11270
Tested-by: Nicolas Capens <nicolascapens@google.com>
Reviewed-by: Alexis Hétu <sugoi@google.com>
Reviewed-by: Nicolas Capens <nicolascapens@google.com>

src/Common/DebugAndroid.hpp

diff --git a/src/Common/DebugAndroid.hpp b/src/Common/DebugAndroid.hpp
index ac937e0..6dfb61d 100644
--- 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

src/Reactor/Reactor.hpp

diff --git a/src/Reactor/Reactor.hpp b/src/Reactor/Reactor.hpp
index 62d9397..46973da 100644
--- 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