diff options
| author | Ben Longbons <b.r.longbons@gmail.com> | 2015-01-03 21:50:12 -0800 |
|---|---|---|
| committer | Ben Longbons <b.r.longbons@gmail.com> | 2015-01-03 21:50:12 -0800 |
| commit | 4c91abd6a020ee030114ae3f22d8f6066e7528be (patch) | |
| tree | 9f76256eabe4900a7eef6cbb94b7ed2378b93f48 /src/generic | |
| parent | 0a202555d2e12866b3619af92f50cb38ea4adb12 (diff) | |
| parent | 711680d652a8db17c1b91428b6d6835f30dfb4fd (diff) | |
| download | tmwa-4c91abd6a020ee030114ae3f22d8f6066e7528be.tar.gz tmwa-4c91abd6a020ee030114ae3f22d8f6066e7528be.tar.bz2 tmwa-4c91abd6a020ee030114ae3f22d8f6066e7528be.tar.xz tmwa-4c91abd6a020ee030114ae3f22d8f6066e7528be.zip | |
Merge remote-tracking branch 'origin/hotfix'
Conflicts:
src/map/chrif.cpp
Diffstat (limited to 'src/generic')
| -rw-r--r-- | src/generic/db.hpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/generic/db.hpp b/src/generic/db.hpp index 707d8ae..b0dcf0c 100644 --- a/src/generic/db.hpp +++ b/src/generic/db.hpp @@ -115,7 +115,7 @@ public: V get(const K& k) { Option<Borrowed<V>> vp = impl.search(k); - if OPTION_IS_SOME(v, vp) + if OPTION_IS_SOME_NOLOOP(v, vp) { return *v; } @@ -162,7 +162,7 @@ public: Option<Borrowed<V>> get(const K& k) { Option<Borrowed<U>> up = impl.search(k); - if OPTION_IS_SOME(u, up) + if OPTION_IS_SOME_NOLOOP(u, up) { return Some(borrow(*u->get())); } |