From d2747547b7d2185abefd9ac94c39d615dcfdb3b0 Mon Sep 17 00:00:00 2001 From: Jon Siwek Date: Wed, 4 Mar 2015 16:19:14 -0600 Subject: [PATCH] Adapt to a broker API change. --- aux/broker | 2 +- src/comm/store.bif | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/aux/broker b/aux/broker index 8cc208192b..98da283ba2 160000 --- a/aux/broker +++ b/aux/broker @@ -1 +1 @@ -Subproject commit 8cc208192b4b692a082e22c8dd89c44f69e824d7 +Subproject commit 98da283ba2bc4dc20e67830395299defc21724db diff --git a/src/comm/store.bif b/src/comm/store.bif index 02aa5b8564..745b044be5 100644 --- a/src/comm/store.bif +++ b/src/comm/store.bif @@ -164,13 +164,12 @@ function Store::insert%(h: opaque of Store::Handle, auto& val = comm::opaque_field_to_data(v->AsRecordVal(), frame); using broker::store::expiration_time; - broker::util::optional expiry; auto abs_expiry_val = e->AsRecordVal()->Lookup(0); if ( abs_expiry_val ) { - expiry = expiration_time(abs_expiry_val->AsTime()); + auto expiry = expiration_time(abs_expiry_val->AsTime()); handle->store->insert(key, val, expiry); return new Val(true, TYPE_BOOL); } @@ -180,12 +179,12 @@ function Store::insert%(h: opaque of Store::Handle, if ( rel_expiry_val ) { auto ct = broker::time_point::now().value; - expiry = expiration_time(rel_expiry_val->AsInterval(), ct); + auto expiry = expiration_time(rel_expiry_val->AsInterval(), ct); handle->store->insert(key, val, expiry); return new Val(true, TYPE_BOOL); } - handle->store->insert(key, val, expiry); + handle->store->insert(key, val); return new Val(true, TYPE_BOOL); %}