Closed Bug 1268851 Opened 4 years ago Closed 4 years ago

Conflicting specifiers in declaration of ‘GetSriLog’

Categories

(Core :: DOM: Core & HTML, defect)

48 Branch
defect
Not set

Tracking

()

RESOLVED FIXED
mozilla49
Tracking Status
firefox49 --- fixed

People

(Reporter: farre, Assigned: farre)

Details

(Whiteboard: btpp-active)

Attachments

(1 file, 3 obsolete files)

GetSriLog is defined statically in several source files. When these become included in the same Unified_*.cpp file there is a conflict.
Assignee: nobody → afarre
The solution is a bit ad hoc, but it fixes the issue for this instance.
Attachment #8747035 - Flags: review?(amarchesini)
Whiteboard: btpp-active
https://treeherder.mozilla.org/#/jobs?repo=try&revision=31c8f65725e9

No tests run, since it's only a compilation problem.
Comment on attachment 8747035 [details] [diff] [review]
Add ifndef/define around GetSriLog to avoid multiple declarations

Review of attachment 8747035 [details] [diff] [review]:
-----------------------------------------------------------------

What about if we create a SriLogHelper class that has only a static method. Then we use it everyelse?
Attachment #8747035 - Flags: review?(amarchesini)
Evenemang better. I'll make it so.
Added class SRILogHelper with static method GetSriLog.
Attachment #8747035 - Attachment is obsolete: true
Attachment #8747788 - Flags: review?(amarchesini)
https://treeherder.mozilla.org/#/jobs?repo=try&revision=ded07baf065c

Again now tests run, only successful build checked.
Comment on attachment 8747788 [details] [diff] [review]
0001-Bug-1268851-Add-SRILogHelper-to-hold-GetSriLog-r-bak.patch

Review of attachment 8747788 [details] [diff] [review]:
-----------------------------------------------------------------

::: dom/base/nsStyleLinkElement.cpp
@@ +19,4 @@
>  #include "mozilla/dom/FragmentOrElement.h"
>  #include "mozilla/dom/ShadowRoot.h"
>  #include "mozilla/Preferences.h"
> +#include "mozilla/dom/SRILogHelper.h"

move 1 line above.
Attachment #8747788 - Flags: review?(amarchesini) → review+
Sorted header files.
Attachment #8747788 - Attachment is obsolete: true
Added namespace qualifier to SRILogHelper.
Attachment #8748072 - Attachment is obsolete: true
Keywords: checkin-needed
https://hg.mozilla.org/mozilla-central/rev/aef562eaad80
Status: NEW → RESOLVED
Closed: 4 years ago
Resolution: --- → FIXED
Target Milestone: --- → mozilla49
Component: DOM → DOM: Core & HTML
You need to log in before you can comment on or make changes to this bug.