Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-28 15:23:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1550422 - P00. Fix Windows compilation. r=dmajor

Browse Source 
Following the shift in unified build setup following the removal of gfxPrefs.{cpp,c} we hit this error.

Unified builds made this header get included with other files that use multiple inheritance, and clang-cl about the conflicting inheritance models. Local testing suggests clang-cl doesn't need the pragma anyway, so just take it out.

Differential Revision: https://phabricator.services.mozilla.com/D31465

--HG--
extra : moz-landing-system : lando
This commit is contained in:
Jean-Yves Avenard 2019-05-25 10:13:00 +00:00
parent b66d4957dd
commit 0f82b873e6
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gfx/2d/unittest/TestBase.h
View File

@ -9,8 +9,9 @@
#include <string>
#include <vector>
#ifdef _MSC_VER
#if defined(_MSC_VER) && !defined(__clang__)
// On MSVC otherwise our generic member pointer trick doesn't work.
// JYA: Do we still need this?
# pragma pointers_to_members(full_generality, single_inheritance)
#endif