| commit | 47e9a0e2826e6e346a50aca61e6c1355be785834 | [log] [tgz] |
|---|---|---|
| author | Nicolas Capens <capn@google.com> | Tue Dec 19 09:40:53 2017 -0500 |
| committer | Nicolas Capens <nicolascapens@google.com> | Tue Dec 19 14:44:01 2017 +0000 |
| tree | 9b750997d05cb57bc600bba6f35c5598354fe9d2 | |
| parent | e58d730a22f1017c7c28a72229cc2f694d6ad65f [diff] |
Fix Android build. Change-Id: If37158efec1555a3b4e14774dff081f284292245 Reviewed-on: https://swiftshader-review.googlesource.com/15308 Reviewed-by: Nicolas Capens <nicolascapens@google.com> Tested-by: Nicolas Capens <nicolascapens@google.com>
diff --git a/src/OpenGL/compiler/Android.mk b/src/OpenGL/compiler/Android.mk index 95b3018..867f70a 100644 --- a/src/OpenGL/compiler/Android.mk +++ b/src/OpenGL/compiler/Android.mk
@@ -37,8 +37,8 @@ endif COMMON_SRC_FILES := \ - preprocessor/Diagnostics.cpp \ - preprocessor/DirectiveHandler.cpp \ + preprocessor/DiagnosticsBase.cpp \ + preprocessor/DirectiveHandlerBase.cpp \ preprocessor/DirectiveParser.cpp \ preprocessor/ExpressionParser.cpp \ preprocessor/Input.cpp \
diff --git a/src/OpenGL/compiler/preprocessor/MacroExpander.cpp b/src/OpenGL/compiler/preprocessor/MacroExpander.cpp index 9be3d46..a235112 100644 --- a/src/OpenGL/compiler/preprocessor/MacroExpander.cpp +++ b/src/OpenGL/compiler/preprocessor/MacroExpander.cpp
@@ -69,7 +69,7 @@ ~ScopedMacroReenabler(); private: - PP_DISALLOW_COPY_AND_ASSIGN(MacroExpander::ScopedMacroReenabler); + PP_DISALLOW_COPY_AND_ASSIGN(ScopedMacroReenabler); MacroExpander *mExpander; };
diff --git a/src/OpenGL/compiler/preprocessor/Preprocessor.h b/src/OpenGL/compiler/preprocessor/Preprocessor.h index 8fdb2f6..a8e139c 100644 --- a/src/OpenGL/compiler/preprocessor/Preprocessor.h +++ b/src/OpenGL/compiler/preprocessor/Preprocessor.h
@@ -17,6 +17,8 @@ #include "pp_utils.h" +#include <cstddef> + namespace pp {
diff --git a/src/OpenGL/compiler/preprocessor/numeric_lex.h b/src/OpenGL/compiler/preprocessor/numeric_lex.h index 64faa26..ed22e03 100644 --- a/src/OpenGL/compiler/preprocessor/numeric_lex.h +++ b/src/OpenGL/compiler/preprocessor/numeric_lex.h
@@ -18,6 +18,7 @@ #define COMPILER_PREPROCESSOR_NUMERIC_LEX_H_ #include <sstream> +#include <cmath> namespace pp {