945590 - nsCellMap.h:217:26: error: reference to 'Corner' is ambiguous when building with 12 unified sources instead of 16

Status: RESOLVED FIXED

(Core :: Layout, defect)

Description

[Mike Hommey [:glandium]]

Open python/mozbuild/mozbuild/backend/recursivemake.py, search for files_per_unification, replace its value (16) with 12.

This is the (one of the multiple) error(s) you can get then:

layout/generic/../tables/nsCellMap.h:217:26: error: reference to 'Corner' is ambiguous
  void SetBCBorderCorner(Corner      aCorner,
                         ^
layout/generic/../tables/nsCellMap.h:39:6: note: candidate found by name lookup is 'Corner'
enum Corner
     ^
../../dist/include/gfxRect.h:29:14: note: candidate found by name lookup is 'mozilla::css::Corner'
        enum Corner {

Comment 1

[(no longer active)]

Attachment: Disambiguate the name 'Corner' in nsCellMap.h; r=dholbert

Comment 2

[Daniel Holbert [:dholbert]]

Comment on attachment 8341681 [details] [diff] [review]
Disambiguate the name 'Corner' in nsCellMap.h; r=dholbert

I'd rather drop nsCellMap.h's ::Corner enum, and instead make nsCellMap.h use the mozilla::css::Corner class (which it looks like we use elsewhere in layout, e.g. nsComputedDOMStyle.cpp, nsCSSRenderingBorders.cpp and nsCSSRenderingBorders.cpp).[1]

But if you don't have time to do that, I'm also fine with the attached patch, as an incremental step towards more-functional unified builds. In that case, please at least file a followup on dropping nsCellMap.h's Corner enum.

[1] in those cases, note that these enums are hidden behind #defines like NS_CORNER_TOP_LEFT and also the shorthand C_TL.

Comment 3

[(no longer active)]

Bug 945914 filed as a follow-up.

Comment 4

[(no longer active)]

https://hg.mozilla.org/integration/mozilla-inbound/rev/2fbd41f11ba6

Comment 5

[Carsten Book [:Tomcat]]

https://hg.mozilla.org/mozilla-central/rev/2fbd41f11ba6
https://hg.mozilla.org/mozilla-central/rev/5bdb9cff69cc