Page MenuHomeWildfire Games

Fix notes in rP24161.
Needs ReviewPublic

Authored by Freagarach on Wed, Nov 11, 9:00 PM.

Details

Reviewers
vladislavbelov
Summary

@vladislavbelov noted some issues in rP24161. This patch fixes those.

Test Plan

Check for more possible improvements.

Unit TestsFailed

TimeTest
0 msJenkins > cxxtest_debug.xml::[failed-to-read]
Failed to read test report file E:\Jenkins\workspace\vs2015-differential\cxxtest_debug.xml org.dom4j.DocumentException: Error on line 346 of document : Content is not allowed in trailing section. at org.dom4j.io.SAXReader.read(SAXReader.java:511)
0 msJenkins > TestAllocators::test_da
0 msJenkins > TestAtlasObjectXML::test_parse_attributes1
0 msJenkins > TestAtlasObjectXML::test_parse_attributes2
0 msJenkins > TestAtlasObjectXML::test_parse_basic
View Full Test Results (1 Failed · 342 Passed)

Event Timeline

Freagarach created this revision.Wed, Nov 11, 9:00 PM
Owners added a subscriber: Restricted Owners Package.Wed, Nov 11, 9:00 PM
Freagarach added inline comments.Wed, Nov 11, 9:02 PM
source/graphics/MapReader.cpp
1080

You don't need Turrets content anymore, you can move it instead of copying.

And how would I move?

Build failure - The Moirai have given mortals hearts that can endure.

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

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

builderr-release-macos.txt
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ranlib: file: ../../../binaries/system/libsimulation2.a(precompiled.o) has no symbols
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ranlib: file: ../../../binaries/system/libengine.a(precompiled.o) has no symbols
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ranlib: file: ../../../binaries/system/libgraphics.a(precompiled.o) has no symbols
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ranlib: file: ../../../binaries/system/libatlas.a(precompiled.o) has no symbols
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ranlib: file: ../../../binaries/system/libgui.a(precompiled.o) has no symbols
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ranlib: file: ../../../binaries/system/liblowlevel.a(dbghelp.o) has no symbols
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ranlib: file: ../../../binaries/system/liblowlevel.a(file_stats.o) has no symbols
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ranlib: file: ../../../binaries/system/liblowlevel.a(vfs_path.o) has no symbols

Link to build: https://jenkins.wildfiregames.com/job/macos-differential/1840/display/redirect

Freagarach requested review of this revision.Wed, Nov 11, 10:19 PM
vladislavbelov added inline comments.Fri, Nov 13, 3:22 PM
source/graphics/MapReader.cpp
1080

Move semantic of C++.

Freagarach updated this revision to Diff 14025.EditedWed, Nov 18, 9:00 PM
Freagarach marked an inline comment as done.

Move.
Include move from rP23529.

Owners added a subscriber: Restricted Owners Package.Wed, Nov 18, 9:00 PM

Build failure - The Moirai have given mortals hearts that can endure.

builderr-debug-gcc6.txt
�}�S:0:0: internal compiler error: Bus error
Please submit a full bug report,
with preprocessed source if appropriate.
See <http://gcc.gnu.org/bugs.html> for instructions.
make[1]: *** [obj/simulation2_Debug/ICmpGarrisonHolder.o] Error 1
make: *** [simulation2] Error 2

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

wraitii added inline comments.
source/simulation2/components/ICmpGarrisonHolder.cpp
38

ought to take && if you're moving into it, and then you don't really care about clear() since it's a temporary