summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNobuaki Sukegawa <nsukeg@gmail.com>2014-11-30 18:24:48 +0900
committerNobuaki Sukegawa <nsukeg@gmail.com>2014-12-01 16:58:23 +0100
commitc6170fa5ee26cf9d0f2140d998fba2420ad1ed79 (patch)
tree1015a819e6b246a999effc18a077a815a261deb1
parent2bb2ebef4c86c588c3041569ffb090041ffc6b04 (diff)
downloadqtscript-c6170fa5ee26cf9d0f2140d998fba2420ad1ed79.tar.gz
Fix clang C++11 build
clang with "-std=c++11" does not allow implicit conversion from false to null pointer. Although clang with C++03 and gcc with C++03/11 treat it as warning, not error, the conversion was in fact invalid. Change-Id: I92629f9e313d0a00c4d39ce2e539ed140707ad5c Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com>
-rw-r--r--src/3rdparty/javascriptcore/JavaScriptCore/yarr/RegexCompiler.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/yarr/RegexCompiler.cpp b/src/3rdparty/javascriptcore/JavaScriptCore/yarr/RegexCompiler.cpp
index 9cd3d12..c37bf51 100644
--- a/src/3rdparty/javascriptcore/JavaScriptCore/yarr/RegexCompiler.cpp
+++ b/src/3rdparty/javascriptcore/JavaScriptCore/yarr/RegexCompiler.cpp
@@ -719,7 +719,7 @@ const char* compileRegex(const UString& patternString, RegexPattern& pattern)
constructor.setupOffsets();
- return false;
+ return NULL;
};