diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2019-03-18 13:52:29 +0100 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2019-03-18 13:52:29 +0100 |
| commit | 01b683899f264608827b3a12acf92691d0e267c4 (patch) | |
| tree | cb6bef817d3790227708cb3d65ccf41fd603db54 /src/lib/corelib/parser/qmljsparser.cpp | |
| parent | 1393307cb216fc283d192af4c04e3ab709b5e54d (diff) | |
| parent | e0ada9c8aeef0a1adc2328c622c1a7aba6a93aff (diff) | |
Merge 1.13 into master
Change-Id: I0678ef8cf6f81489914e79be903ca4d4c1cebada
Diffstat (limited to 'src/lib/corelib/parser/qmljsparser.cpp')
| -rw-r--r-- | src/lib/corelib/parser/qmljsparser.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/lib/corelib/parser/qmljsparser.cpp b/src/lib/corelib/parser/qmljsparser.cpp index e90f3af9d..71cff876d 100644 --- a/src/lib/corelib/parser/qmljsparser.cpp +++ b/src/lib/corelib/parser/qmljsparser.cpp @@ -69,7 +69,8 @@ void Parser::reallocateStack() sym_stack = reinterpret_cast<Value*> (realloc(sym_stack, stack_size * sizeof(Value))); state_stack = reinterpret_cast<int*> (realloc(state_stack, stack_size * sizeof(int))); location_stack = reinterpret_cast<AST::SourceLocation*> (realloc(location_stack, stack_size * sizeof(AST::SourceLocation))); - string_stack = reinterpret_cast<QStringRef*> (realloc(string_stack, stack_size * sizeof(QStringRef))); + string_stack = reinterpret_cast<QStringRef*> (realloc( + static_cast<void *>(string_stack), stack_size * sizeof(QStringRef))); } Parser::Parser(Engine *engine): |