MirrorHub/construct
0
0
Fork 0
mirror of https://github.com/matrix-construct/construct synced 2024-11-26 08:42:34 +01:00
Code Issues Releases Wiki Activity

ircd::db: Fix erroneous calls when stacking overloads.

Browse source 
modules/s_keys: Fix erroneous calls when stacking overloads (regression).
This commit is contained in:
Jason Volk 2019-06-23 23:06:50 -06:00
parent 9d48215aaa
commit 2f74142737
2 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ircd/db.cc
View file

@ -7407,7 +7407,12 @@ std::vector<std::string>
ircd::db::column_names(const std::string &path, ircd::db::column_names(const std::string &path,
const std::string &options) const std::string &options)
{ {
return column_names(path, db::options{options}); const rocksdb::DBOptions opts
{
db::options(options)
};
return column_names(path, opts);
} }
/// Note that if there is no database found at path we still return a /// Note that if there is no database found at path we still return a

3
modules/s_keys.cc
View file

@ -21,7 +21,8 @@ ircd::m::verify(const m::keys &keys,
std::nothrow_t) std::nothrow_t)
noexcept try noexcept try
{ {
return verify(keys, std::nothrow); verify(keys);
return true;
} }
catch(const std::exception &e) catch(const std::exception &e)
{ {