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 | |
| parent | 3f01dc199560e7d31f8941dc81e99a17d2e95cdf (diff) | |
[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>
| -rw-r--r-- | src/3rdparty/angle/src/compiler/preprocessor/MacroExpander.h | 2 | ||||
| -rw-r--r-- | src/angle/patches/0017-Remove-usage-of-auto_ptr-in-MacroExpander.patch | 31 |
2 files changed, 32 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; }; diff --git a/src/angle/patches/0017-Remove-usage-of-auto_ptr-in-MacroExpander.patch b/src/angle/patches/0017-Remove-usage-of-auto_ptr-in-MacroExpander.patch new file mode 100644 index 0000000000..314a985bab --- /dev/null +++ b/src/angle/patches/0017-Remove-usage-of-auto_ptr-in-MacroExpander.patch @@ -0,0 +1,31 @@ +From 946903d23ae361ddb05d2c0f64b339eb1694311b Mon Sep 17 00:00:00 2001 +From: Corentin Wallez <cwallez@chromium.org> +Date: Mon, 18 Apr 2016 17:30:07 -0400 +Subject: [PATCH] Remove usage of auto_ptr in MacroExpander + +BUG=angleproject:1269 + +Change-Id: I1fafa102b065f6da1797e8790ec3ed498d9d8b45 +Reviewed-on: https://chromium-review.googlesource.com/339379 +Reviewed-by: Jamie Madill <jmadill@chromium.org> +Commit-Queue: Corentin Wallez <cwallez@chromium.org> +--- + src/compiler/preprocessor/MacroExpander.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/compiler/preprocessor/MacroExpander.h b/src/compiler/preprocessor/MacroExpander.h +index 3cc860d75..dc870f626 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; + }; + +-- +2.15.0.windows.1 + |