1277624 - fix misplaced declarations of mozilla::jni::Context<>::name for clang's benefit

Status: RESOLVED FIXED

(Core Graveyard :: Widget: Android, defect)

Description

[Nathan Froyd [:froydnj]]

Generated Android bindings have code like:

namespace mozilla {
namespace widget {
namespace sdk {

template<> const char mozilla::jni::Context<Rect, jobject>::name[] =
        "android/graphics/Rect";

...

clang complains about this:

/opt/build/froydnj/build-android/widget/android/bindings/AndroidRect.cpp:14:61: error: cannot define or redeclare 'name' here because namespace 'sdk' does not enclose namespace 'Context<mozilla::widget::sdk::Rect, _jobject *>'
template<> const char mozilla::jni::Context<Rect, jobject>::name[] =
                      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^
/opt/build/froydnj/build-android/widget/android/bindings/AndroidRect.cpp:556:62: error: cannot define or redeclare 'name' here because namespace 'sdk' does not enclose namespace 'Context<mozilla::widget::sdk::RectF, _jobject *>'
template<> const char mozilla::jni::Context<RectF, jobject>::name[] =
                      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^

So I guess we need to move these out a couple of levels.

Comment 1

[(inactive) Jim Chen [:jchen] [:darchons]]

Attachment: Move JNI class name out of Context (v1)

Move the class name strings into ObjectBase, so that the strings can be
overridden by derived classes in other namespaces.

Comment 2

[(inactive) Jim Chen [:jchen] [:darchons]]

Attachment: Update auto-generated bindings (v1)

Comment 3

[(inactive) Jim Chen [:jchen] [:darchons]]

Attachment: Don't use anonymous namespace in headers (v1)

Trivial patch to not use anonymous namespace in headers, which can
introduce multiple copies of the same code in different compilation
units.

Comment 4

[Nathan Froyd [:froydnj]]

For the record, these patches do fix the compilation errors with clang.

Comment 5

[Nathan Froyd [:froydnj]]

Jim, can you land these?

Comment 6

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/integration/mozilla-inbound/rev/91ca677e4496
Move JNI class name out of Context; r=snorp
https://hg.mozilla.org/integration/mozilla-inbound/rev/6f2a56ca83e7
Update auto-generated bindings; r=me
https://hg.mozilla.org/integration/mozilla-inbound/rev/5c6ee7ceb0a9
Don't use anonymous namespace in headers; r=me

Comment 7

[Carsten Book [:Tomcat]]

https://hg.mozilla.org/mozilla-central/rev/91ca677e4496
https://hg.mozilla.org/mozilla-central/rev/6f2a56ca83e7
https://hg.mozilla.org/mozilla-central/rev/5c6ee7ceb0a9