diff options
| author | Corentin Wallez <cwallez@chromium.org> | 2016-04-18 17:30:07 -0400 |
|---|---|---|
| committer | Oliver Wolff <oliver.wolff@qt.io> | 2018-06-21 13:13:04 +0000 |
| commit | 8d99965161f72b46cdbec53b725c824206ebd3c3 (patch) | |
| tree | 5a4394ba33cf384eba745945c34bff93f8295cce /src/3rdparty/angle | |
| parent | 3f01dc199560e7d31f8941dc81e99a17d2e95cdf (diff) | |
| download | qtbase-8d99965161f72b46cdbec53b725c824206ebd3c3.tar.gz | |
[Backport] Remove usage of auto_ptr in MacroExpander
BUG=angleproject:1269
Task-number: QTBUG-68954
Change-Id: Ie4ebea85bc3721e79c7414dea62ca7a042b2421c
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
Diffstat (limited to 'src/3rdparty/angle')
| -rw-r--r-- | src/3rdparty/angle/src/compiler/preprocessor/MacroExpander.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/3rdparty/angle/src/compiler/preprocessor/MacroExpander.h b/src/3rdparty/angle/src/compiler/preprocessor/MacroExpander.h index 3cc860d753..dc870f626f 100644 --- a/src/3rdparty/angle/src/compiler/preprocessor/MacroExpander.h +++ b/src/3rdparty/angle/src/compiler/preprocessor/MacroExpander.h @@ -83,7 +83,7 @@ class MacroExpander : public Lexer Diagnostics *mDiagnostics; bool mParseDefined; - std::auto_ptr<Token> mReserveToken; + std::unique_ptr<Token> mReserveToken; std::vector<MacroContext *> mContextStack; }; |