Differential D2298

Fix GlooxScriptConversions include in rP22856 / D2264 triggering VS2015 build warning (but no clang, c++ warning, and should become reported on Phabricator)
ClosedPublic
Actions

Authored by elexis on Sep 16 2019, 6:53 PM.

Tags

None

Subscribers

None

Details

Reviewers: None
Commits: rP22919: Fix wrong GlooxScriptConversions include in rP22856 / D2264 triggering VS2015…

Summary

In rP22856 / D2264 there was a wrong include that triggered a VS2015 build warning. But that warning was not reported on Phabricator, refs #5596. The warning also didn't occur on clang (nor gcc IIRC).

Test Plan

Make sure the build warning is present before the patch and gone afterwards, and nothing else being modified by the patch.

Diff Detail

Repository

rP 0 A.D. Public Repository

Lint

Automatic diff as part of commit; lint not applicable.

Unit

Automatic diff as part of commit; unit tests not applicable.

Event Timeline

elexis created this revision.Sep 16 2019, 6:53 PM

Successful build - Chance fights ever on the side of the prudent.

Link to build: https://jenkins.wildfiregames.com/job/docker-differential/722/display/redirect

Retry after Jenkins recovery.

Successful build - Chance fights ever on the side of the prudent.

Link to build: https://jenkins.wildfiregames.com/job/vs2015-differential/226/display/redirect

Successful build - Chance fights ever on the side of the prudent.

Link to build: https://jenkins.wildfiregames.com/job/docker-differential/737/display/redirect

Harbormaster completed remote builds in B9436: Diff 9826.Sep 17 2019, 10:23 PM

See (but only in logs):

E:\Jenkins\workspace\vs2015-differential>cd build\workspaces\vc2015   && MSBuild.exe pyrogenesis.sln /m:2 /p:PlatformToolset=v140_xp /t:pyrogenesis /t:test /p:Configuration=Release -clp:Warningsonly -clp:ErrorsOnly 

Microsoft (R) Build Engine version 14.0.25420.1

Copyright (C) Microsoft Corporation. All rights reserved.


     7>XmppClient.obj : warning LNK4006: "public: static void __cdecl ScriptInterface::ToJSVal<class glooxwrapper::string>(struct JSContext *,class JS::MutableHandle<class JS::Value>,class glooxwrapper::string const &)" (??$ToJSVal@Vstring@glooxwrapper@@@ScriptInterface@@SAXPAUJSContext@@V?$MutableHandle@VValue@JS@@@JS@@ABVstring@glooxwrapper@@@Z) already defined in GlooxScriptConversions.obj; second definition ignored [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vc2015\lobby.vcxproj]

     7>XmppClient.obj : warning LNK4006: "public: static void __cdecl ScriptInterface::ToJSVal<enum gloox::CertStatus>(struct JSContext *,class JS::MutableHandle<class JS::Value>,enum gloox::CertStatus const &)" (??$ToJSVal@W4CertStatus@gloox@@@ScriptInterface@@SAXPAUJSContext@@V?$MutableHandle@VValue@JS@@@JS@@ABW4CertStatus@gloox@@@Z) already defined in GlooxScriptConversions.obj; second definition ignored [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vc2015\lobby.vcxproj]

     7>XmppClient.obj : warning LNK4006: "public: static void __cdecl ScriptInterface::ToJSVal<enum gloox::ConnectionError>(struct JSContext *,class JS::MutableHandle<class JS::Value>,enum gloox::ConnectionError const &)" (??$ToJSVal@W4ConnectionError@gloox@@@ScriptInterface@@SAXPAUJSContext@@V?$MutableHandle@VValue@JS@@@JS@@ABW4ConnectionError@gloox@@@Z) already defined in GlooxScriptConversions.obj; second definition ignored [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vc2015\lobby.vcxproj]

     7>XmppClient.obj : warning LNK4006: "public: static void __cdecl ScriptInterface::ToJSVal<enum gloox::MUCRoomRole>(struct JSContext *,class JS::MutableHandle<class JS::Value>,enum gloox::MUCRoomRole const &)" (??$ToJSVal@W4MUCRoomRole@gloox@@@ScriptInterface@@SAXPAUJSContext@@V?$MutableHandle@VValue@JS@@@JS@@ABW4MUCRoomRole@gloox@@@Z) already defined in GlooxScriptConversions.obj; second definition ignored [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vc2015\lobby.vcxproj]

     7>XmppClient.obj : warning LNK4006: "public: static void __cdecl ScriptInterface::ToJSVal<enum gloox::Presence::PresenceType>(struct JSContext *,class JS::MutableHandle<class JS::Value>,enum gloox::Presence::PresenceType const &)" (??$ToJSVal@W4PresenceType@Presence@gloox@@@ScriptInterface@@SAXPAUJSContext@@V?$MutableHandle@VValue@JS@@@JS@@ABW4PresenceType@Presence@gloox@@@Z) already defined in GlooxScriptConversions.obj; second definition ignored [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vc2015\lobby.vcxproj]

     7>XmppClient.obj : warning LNK4006: "public: static void __cdecl ScriptInterface::ToJSVal<enum gloox::RegistrationResult>(struct JSContext *,class JS::MutableHandle<class JS::Value>,enum gloox::RegistrationResult const &)" (??$ToJSVal@W4RegistrationResult@gloox@@@ScriptInterface@@SAXPAUJSContext@@V?$MutableHandle@VValue@JS@@@JS@@ABW4RegistrationResult@gloox@@@Z) already defined in GlooxScriptConversions.obj; second definition ignored [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vc2015\lobby.vcxproj]

     7>XmppClient.obj : warning LNK4006: "public: static void __cdecl ScriptInterface::ToJSVal<enum gloox::StanzaError>(struct JSContext *,class JS::MutableHandle<class JS::Value>,enum gloox::StanzaError const &)" (??$ToJSVal@W4StanzaError@gloox@@@ScriptInterface@@SAXPAUJSContext@@V?$MutableHandle@VValue@JS@@@JS@@ABW4StanzaError@gloox@@@Z) already defined in GlooxScriptConversions.obj; second definition ignored [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vc2015\lobby.vcxproj]

Now let Jenkins test the fix.

Successful build - Chance fights ever on the side of the prudent.

Link to build: https://jenkins.wildfiregames.com/job/vs2015-differential/228/display/redirect

Successful build - Chance fights ever on the side of the prudent.

Link to build: https://jenkins.wildfiregames.com/job/docker-differential/739/display/redirect

Harbormaster completed remote builds in B9439: Diff 9829.Sep 17 2019, 10:33 PM

This revision was not accepted when it landed; it landed in state Needs Review.Sep 17 2019, 10:39 PM

Closed by commit rP22919: Fix wrong GlooxScriptConversions include in rP22856 / D2264 triggering VS2015… (authored by elexis). · Explain Why

This revision was automatically updated to reflect the committed changes.

elexis added a commit: rP22919: Fix wrong GlooxScriptConversions include in rP22856 / D2264 triggering VS2015….

Revision Contents
Changeset List

Path

Size

ps/

trunk/

source/

lobby/

1 line

Diff 9832

ps/trunk/source/lobby/XmppClient.cpp

Loading...