From 8d99965161f72b46cdbec53b725c824206ebd3c3 Mon Sep 17 00:00:00 2001 From: Corentin Wallez Date: Mon, 18 Apr 2016 17:30:07 -0400 Subject: [Backport] Remove usage of auto_ptr in MacroExpander BUG=angleproject:1269 Task-number: QTBUG-68954 Change-Id: Ie4ebea85bc3721e79c7414dea62ca7a042b2421c Reviewed-by: Kai Koehne --- ...Remove-usage-of-auto_ptr-in-MacroExpander.patch | 31 ++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 src/angle/patches/0017-Remove-usage-of-auto_ptr-in-MacroExpander.patch (limited to 'src/angle') 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 +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 +Commit-Queue: Corentin Wallez +--- + 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 mReserveToken; ++ std::unique_ptr mReserveToken; + std::vector mContextStack; + }; + +-- +2.15.0.windows.1 + -- cgit v1.2.3