diff options
| author | Ben Longbons <b.r.longbons@gmail.com> | 2015-01-03 21:07:56 -0800 |
|---|---|---|
| committer | Ben Longbons <b.r.longbons@gmail.com> | 2015-01-03 21:58:26 -0800 |
| commit | 00da6b5977574a0564169172227d8aab45be188f (patch) | |
| tree | dd52eee506a98e1eb9fcdea52e7db25079a7ad28 /src/generic | |
| parent | 4c91abd6a020ee030114ae3f22d8f6066e7528be (diff) | |
| download | tmwa-00da6b5977574a0564169172227d8aab45be188f.tar.gz tmwa-00da6b5977574a0564169172227d8aab45be188f.tar.bz2 tmwa-00da6b5977574a0564169172227d8aab45be188f.tar.xz tmwa-00da6b5977574a0564169172227d8aab45be188f.zip | |
Switch MATCH to separate begin/end macros
The for loop trick turned out to be very prone to infinite loops
at runtime. It's better to force compiler errors even if it's ugly.
Diffstat (limited to 'src/generic')
| -rw-r--r-- | src/generic/db.hpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/generic/db.hpp b/src/generic/db.hpp index b0dcf0c..04ead79 100644 --- a/src/generic/db.hpp +++ b/src/generic/db.hpp @@ -115,10 +115,11 @@ public: V get(const K& k) { Option<Borrowed<V>> vp = impl.search(k); - if OPTION_IS_SOME_NOLOOP(v, vp) + OMATCH_BEGIN_SOME (v, vp) { return *v; } + OMATCH_END (); return V(); } void put(const K& k, V v) @@ -162,10 +163,11 @@ public: Option<Borrowed<V>> get(const K& k) { Option<Borrowed<U>> up = impl.search(k); - if OPTION_IS_SOME_NOLOOP(u, up) + OMATCH_BEGIN_SOME (u, up) { return Some(borrow(*u->get())); } + OMATCH_END (); return None; } void put(const K& k, U v) |