diff options
| author | Ben Longbons <b.r.longbons@gmail.com> | 2014-10-13 13:16:34 -0700 |
|---|---|---|
| committer | Ben Longbons <b.r.longbons@gmail.com> | 2014-10-13 14:03:46 -0700 |
| commit | 780a0d771edbe21dcfa3405163ffbdf7f7fa4604 (patch) | |
| tree | ac202254d015d2a2a28ab5bca60c3f5474d168ba /src/mmo | |
| parent | a5e0fe8204a8b3299507a645f3479e9ead6c6110 (diff) | |
| download | tmwa-780a0d771edbe21dcfa3405163ffbdf7f7fa4604.tar.gz tmwa-780a0d771edbe21dcfa3405163ffbdf7f7fa4604.tar.bz2 tmwa-780a0d771edbe21dcfa3405163ffbdf7f7fa4604.tar.xz tmwa-780a0d771edbe21dcfa3405163ffbdf7f7fa4604.zip | |
Convert container lookups to use Option<Borrowed<T>>
Diffstat (limited to 'src/mmo')
| -rw-r--r-- | src/mmo/mmo.hpp | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/mmo/mmo.hpp b/src/mmo/mmo.hpp index e3cf0e4..d627c90 100644 --- a/src/mmo/mmo.hpp +++ b/src/mmo/mmo.hpp @@ -22,6 +22,7 @@ #include "fwd.hpp" +#include "../compat/borrow.hpp" #include "../compat/memory.hpp" #include "../proto2/types.hpp" @@ -58,13 +59,10 @@ struct GM_Account struct PartyPair { - PartyId party_id = {}; - PartyMost *party_most = {}; + PartyId party_id; + Borrowed<PartyMost> party_most; - explicit - operator bool() const { return party_most; } - bool operator !() const { return !party_most; } - PartyMost *operator->() { return party_most; } - const PartyMost *operator->() const { return party_most; } + PartyMost& operator *() const { return *party_most; } + Borrowed<PartyMost> operator->() const { return party_most; } }; } // namespace tmwa |