diff options
| author | Ivan Murashov <ivan.murashov@lge.com> | 2021-07-20 13:16:44 +0300 |
|---|---|---|
| committer | Angle LUCI CQ <angle-scoped@luci-project-accounts.iam.gserviceaccount.com> | 2021-07-20 14:04:39 +0000 |
| commit | 7108f83c8ad1bad4072e4f32da3db6d59cf51400 (patch) | |
| tree | da8831b1fe6eba5c35ffed9d446e94b7b6597bc7 | |
| parent | e635f6c2f6f8aea77e5ec42df9615a9f5257d0cb (diff) | |
| download | angle-7108f83c8ad1bad4072e4f32da3db6d59cf51400.tar.gz | |
GCC: Remove double declaration of ContextSet
After the CL
https://chromium-review.googlesource.com/c/angle/angle/+/2965780
the build with GCC failed with error:
/third_party/angle/src/libANGLE/Display.h:325:37: error: declaration of
'typedef class std::__1::set<gl::Context*> egl::Display::ContextSet'
changes meaning of 'ContextSet' [-fpermissive]
/third_party/angle/src/libANGLE/Display.h:75:7: note: 'ContextSet'
declared here as 'using ContextSet = class std::__1::set<gl::Context*>'
To fix the error the double declaration of ContextSet is removed.
Bug: angleproject:5878, chromium:819294
Change-Id: Id9e52061af53ea18dd5d13b960daaa67a14f61ca
Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/3038804
Reviewed-by: Jamie Madill <jmadill@chromium.org>
Commit-Queue: Jamie Madill <jmadill@chromium.org>
| -rw-r--r-- | CONTRIBUTORS | 1 | ||||
| -rw-r--r-- | src/libANGLE/Display.h | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/CONTRIBUTORS b/CONTRIBUTORS index 887ddc266b..94b1b4d1dd 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -154,6 +154,7 @@ Advanced Micro Devices, Inc. LG Electronics, Inc. Jani Hautakangas + Ivan Murashov IBM Inc. Junliang Yan diff --git a/src/libANGLE/Display.h b/src/libANGLE/Display.h index f33123b719..f0c0910442 100644 --- a/src/libANGLE/Display.h +++ b/src/libANGLE/Display.h @@ -322,7 +322,6 @@ class Display final : public LabeledObject, ConfigSet mConfigSet; - typedef std::set<gl::Context *> ContextSet; ContextSet mContextSet; typedef std::set<Image *> ImageSet; |