Fix replay menu std::time conversion on 32bit systems following 19200
AbandonedPublic
Actions

Authored by elexis on Mar 7 2017, 11:14 AM.

Details

Reviewers

Summary

That commit fails to compile on 32 bit Ubuntu systems as reported some days ago by ricotz and by causative today.

ricotz build log posted in irc on 26th Feb 2017:
https://launchpadlibrarian.net/308937173/buildlog_ubuntu-yakkety-i386.0ad_0.0.21+r19243-0ubuntu1~16.10~wfg0_BUILDING.txt.gz

../../../binaries/system/libengine.a(Replay.o): In function `void ScriptInterface::AssignOrToJSVal<long>(JSContext*, JS::MutableHandle<JS::Value>, long const&)':
./build/workspaces/gcc/../../../source/scriptinterface/ScriptInterface.h:445: undefined reference to `void ScriptInterface::ToJSVal<long>(JSContext*, JS::MutableHandle<JS::Value>, long const&)'

Diff confirmed working by causative today on irc.

Test Plan

Compile pyrogenesis on a 32bit system and on a 64bit system.

Diff Detail

Repository

rP 0 A.D. Public Repository

Branch

/ps/trunk

Lint

No Linters Available

Unit

No Unit Test Coverage

Build Status

Buildable 702
Build 1113: Vulcan Build	Jenkins
Build 1112: arc lint + arc unit

Event Timeline

elexis created this revision.Mar 7 2017, 11:14 AM

elexis mentioned this in rP19200: Use std::time_t in the replay menu (as 64bit integer conversion are implemented….Mar 7 2017, 11:15 AM

elexis retitled this revision from Fix replay menu std::time conversion on 32bit systems following r19200 to Fix replay menu std::time conversion on 32bit systems following 19200.

elexis mentioned this in D112: Use 64bit integer conversion in the replay menu.Mar 7 2017, 11:18 AM

Build is green

Updating workspaces.
Build (release)...
Build (debug)...
Running release tests...
Running cxxtest tests (302 tests)..............................................................................................................................................................................................................................................................................................................OK!
Running debug tests...
Running cxxtest tests (302 tests)..............................................................................................................................................................................................................................................................................................................OK!

http://jw:8080/job/phabricator/480/ for more details.

Harbormaster completed remote builds in B702: Diff 731.Mar 7 2017, 12:09 PM

Compiles for me.

EDIT: using 64-bit Linux

This revision is now accepted and ready to land.Mar 10 2017, 5:24 PM

See D205