Paths

Table of Contentst

Diffusion 0 A.D. Public Repository rP22029

Change internals of EntityMap to use an std::vector
rP22029
Actions

Tags

None

Subscribers

Description

Change internals of EntityMap to use an std::vector

This generally makes this code cleaner and easier to maintain, while also being more modern and fully tested.

Looked at by: leper

Differential Revision: https://code.wildfiregames.com/D8

Details

Committed

Jan 5 2019, 7:19 PM

Differential Revision

D8: Change internals of EntityMap to use an std:: vector

Parents

rP22028: Remove excess argument from shift call

Branches

Unknown

Tags

Unknown

Build Status

Buildable 6730
Build 11068: Trigger Windows Autobuild
Build 11067: Post-Commit Build	Jenkins

Event Timeline

wraitii committed rP22029: Change internals of EntityMap to use an std::vector.Jan 5 2019, 7:19 PM

Harbormaster completed building B6730: rP22029: Change internals of EntityMap to use an std::vector.Jan 5 2019, 8:00 PM

wraitii mentioned this in rP15963: Fix mirages not flushed properly, introduced in r15956..Jan 6 2019, 10:10 AM

wraitii mentioned this in D1737: Slight cleanup of fogging OnDestroy and some comments.Jan 6 2019, 11:54 AM

wraitii added an auditor: Restricted Owners Package.Jan 6 2019, 2:01 PM

This commit now requires audit.Jan 6 2019, 2:01 PM

The reason for the crash is that find() didn't expect to be called with an entity below FIRST_VALID_ENTITY_ID, i.e. INVALID_ENTITY. This should return end() instead so I need to amend this code.

Inserting stuff before FIRST_VALID_ENTITY_ID should probably still crash so the ENSURE there should be fine.

wraitii mentioned this in rP22247: Slight cleanup of fogging OnDestroy and some comments.May 4 2019, 3:50 PM

vladislavbelov added a subscriber: vladislavbelov.May 8 2019, 9:30 PM

vladislavbelov added inline comments.

/ps/trunk/source/simulation2/system/EntityMap.h
65	FYI. The `_` and `__` prefixes are reserved for C++/STL, so we should avoid them. http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2011/n3242.pdf 17.6.4.3.2 Global names [global.names] 1 Certain sets of names and function signatures are always reserved to the implementation: — Each name that contains a double underscore _ _ or begins with an underscore followed by an uppercase letter (2.12) is reserved to the implementation for any use. — Each name that begins with an underscore is reserved to the implementation for use as a name in the global namespace.

Reverted by rP22032.

Stan removed an auditor: Restricted Owners Package.Dec 5 2020, 5:25 PM

This commit no longer requires audit.Dec 5 2020, 5:25 PM

Changes (3)

Path

Size

ps/

trunk/

source/

simulation2/

components/

CCmpRangeManager.cpp

system/

tests/

test_EntityMap.h

rP22029

ps/trunk/source/simulation2/components/CCmpRangeManager.cpp

Loading...

ps/trunk/source/simulation2/system/EntityMap.h

Loading...

ps/trunk/source/simulation2/tests/test_EntityMap.h

Loading...