diff options
| author | Jocelyn Turcotte <jocelyn.turcotte@nokia.com> | 2010-04-06 10:36:47 (GMT) |
|---|---|---|
| committer | Jocelyn Turcotte <jocelyn.turcotte@nokia.com> | 2010-04-06 10:36:47 (GMT) |
| commit | bb35b65bbfba82e0dd0ac306d3dab54436cdaff6 (patch) | |
| tree | 8174cb262a960ff7b2e4aa8f1aaf154db71d2636 /src/3rdparty/webkit/JavaScriptCore/parser/Parser.cpp | |
| parent | 4b27d0d887269583a0f76e922948f8c25e96ab88 (diff) | |
| download | Qt-bb35b65bbfba82e0dd0ac306d3dab54436cdaff6.zip Qt-bb35b65bbfba82e0dd0ac306d3dab54436cdaff6.tar.gz Qt-bb35b65bbfba82e0dd0ac306d3dab54436cdaff6.tar.bz2 | |
Update src/3rdparty/webkit from trunk.
Imported from 839d8709327f925aacb3b6362c06152594def97e
in branch qtwebkit-2.0 of repository
git://gitorious.org/+qtwebkit-developers/webkit/qtwebkit.git
Rubber-stamped-by: Simon Hausmann
Diffstat (limited to 'src/3rdparty/webkit/JavaScriptCore/parser/Parser.cpp')
| -rw-r--r-- | src/3rdparty/webkit/JavaScriptCore/parser/Parser.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/3rdparty/webkit/JavaScriptCore/parser/Parser.cpp b/src/3rdparty/webkit/JavaScriptCore/parser/Parser.cpp index 4c046d0..039fc46 100644 --- a/src/3rdparty/webkit/JavaScriptCore/parser/Parser.cpp +++ b/src/3rdparty/webkit/JavaScriptCore/parser/Parser.cpp @@ -27,9 +27,6 @@ #include "Lexer.h" #include <wtf/HashSet.h> #include <wtf/Vector.h> -#include <memory> - -using std::auto_ptr; #ifndef yyparse extern int jscyyparse(void*); @@ -50,7 +47,7 @@ void Parser::parse(JSGlobalData* globalData, int* errLine, UString* errMsg) errMsg = &defaultErrMsg; *errLine = -1; - *errMsg = 0; + *errMsg = UString(); Lexer& lexer = *globalData->lexer; lexer.setCode(*m_source, m_arena); |