diff options
author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-03-19 09:25:14 +0100 |
---|---|---|
committer | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-03-19 09:56:31 +0100 |
commit | 6313e1fe4c27755adde87e62db1c2f9fac534ae4 (patch) | |
tree | c57bb29f65e02fbfcc07895a8cc2903fff9300ba /src/3rdparty/v8/src/scanner.cc | |
parent | b5a49a260d03249c386f1b63c249089383dd81fa (diff) | |
parent | cac65e7a222b848a735a974b0aeb43209b0cfa18 (diff) | |
download | qtjsbackend-6313e1fe4c27755adde87e62db1c2f9fac534ae4.tar.gz |
Merge branch 'dev' into stable
This starts Qt 5.1 release cycle
Change-Id: I892bbc73c276842894a720f761ce31ad1b015672
Diffstat (limited to 'src/3rdparty/v8/src/scanner.cc')
-rwxr-xr-x | src/3rdparty/v8/src/scanner.cc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/3rdparty/v8/src/scanner.cc b/src/3rdparty/v8/src/scanner.cc index f24af2e..61ee1a4 100755 --- a/src/3rdparty/v8/src/scanner.cc +++ b/src/3rdparty/v8/src/scanner.cc @@ -32,6 +32,11 @@ #include "../include/v8stdint.h" #include "char-predicates-inl.h" +#undef CONST +#undef DELETE +#undef IN +#undef VOID + namespace v8 { namespace internal { @@ -1077,6 +1082,7 @@ bool Scanner::ScanRegExpFlags() { if (!ScanLiteralUnicodeEscape()) { break; } + Advance(); } } literal.Complete(); |