forked from qt-creator/qt-creator
Merge remote-tracking branch 'origin/2.3'
Conflicts: qtcreator.pri Change-Id: Iaca68084799ae9aec257742c395609d6e8aa72cd
This commit is contained in:
2
src/libs/3rdparty/cplusplus/AST.cpp
vendored
2
src/libs/3rdparty/cplusplus/AST.cpp
vendored
@@ -81,7 +81,7 @@ unsigned BaseSpecifierAST::firstToken() const
|
||||
if (access_specifier_token)
|
||||
return access_specifier_token;
|
||||
if (name)
|
||||
name->firstToken();
|
||||
return name->firstToken();
|
||||
// assert?
|
||||
return 0;
|
||||
}
|
||||
|
Reference in New Issue
Block a user