From 780a0d771edbe21dcfa3405163ffbdf7f7fa4604 Mon Sep 17 00:00:00 2001
From: Ben Longbons <b.r.longbons@gmail.com>
Date: Mon, 13 Oct 2014 13:16:34 -0700
Subject: Convert container lookups to use Option<Borrowed<T>>

---
 src/mmo/mmo.hpp | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

(limited to 'src/mmo')

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
-- 
cgit v1.2.3-70-g09d2