Merge branch 'ANGLE-rollback'

This resolves #624

Note: Cherry-picked some fixes on top of the ANGLE version that we want to keep.

1 files changed, 7 insertions, 6 deletions

diff --git a/gfx/angle/src/compiler/preprocessor/Token.cpp b/gfx/angle/src/compiler/preprocessor/Token.cpp
index 41610a402..d10265474 100755
--- a/gfx/angle/src/compiler/preprocessor/Token.cpp
+++ b/gfx/angle/src/compiler/preprocessor/Token.cpp
@@ -4,10 +4,11 @@
 // found in the LICENSE file.
 //
 
-#include "compiler/preprocessor/Token.h"
+#include "Token.h"
 
-#include "common/debug.h"
-#include "compiler/preprocessor/numeric_lex.h"
+#include <cassert>
+
+#include "numeric_lex.h"
 
 namespace pp
 {
@@ -54,19 +55,19 @@ void Token::setExpansionDisabled(bool disable)
 
 bool Token::iValue(int *value) const
 {
-    ASSERT(type == CONST_INT);
+    assert(type == CONST_INT);
     return numeric_lex_int(text, value);
 }
 
 bool Token::uValue(unsigned int *value) const
 {
-    ASSERT(type == CONST_INT);
+    assert(type == CONST_INT);
     return numeric_lex_int(text, value);
 }
 
 bool Token::fValue(float *value) const
 {
-    ASSERT(type == CONST_FLOAT);
+    assert(type == CONST_FLOAT);
     return numeric_lex_float(text, value);
 }