diff options
| author | Dan Goodliffe <dan@randomdan.homeip.net> | 2020-11-17 13:43:56 +0000 |
|---|---|---|
| committer | Dan Goodliffe <dan@randomdan.homeip.net> | 2020-11-17 13:43:56 +0000 |
| commit | 236fc49ffffe2821188b33c6522b4b160862527d (patch) | |
| tree | 4f98df8a8664eacb2faaebb058f1fdf99d339bba | |
| parent | Clang-format (diff) | |
| download | icetray-236fc49ffffe2821188b33c6522b4b160862527d.tar.bz2 icetray-236fc49ffffe2821188b33c6522b4b160862527d.tar.xz icetray-236fc49ffffe2821188b33c6522b4b160862527d.zip | |
New Slicer compat (std::optionals)
| -rw-r--r-- | icetray/icetray/abstractDatabaseClient.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/icetray/icetray/abstractDatabaseClient.h b/icetray/icetray/abstractDatabaseClient.h index 4dc611f..a930f90 100644 --- a/icetray/icetray/abstractDatabaseClient.h +++ b/icetray/icetray/abstractDatabaseClient.h @@ -17,19 +17,19 @@ namespace IceTray { inline Domain fetch(const SqlSource & sql, const Params &... params) { - return fetch<Domain, Params...>(IceUtil::None, sql, params...); + return fetch<Domain, Params...>(std::nullopt, sql, params...); } template<typename Domain, typename... Params> inline Domain fetch(DB::Connection * c, const SqlSource & sql, const Params &... params) { - return fetch<Domain, Params...>(c, IceUtil::None, sql, params...); + return fetch<Domain, Params...>(c, std::nullopt, sql, params...); } template<typename Domain, typename... Params> inline Domain - fetch(const IceUtil::Optional<std::string> & typeIdCol, const SqlSource & sql, const Params &... params) + fetch(const std::optional<std::string> & typeIdCol, const SqlSource & sql, const Params &... params) { auto c = db->get(); return fetch<Domain, Params...>(c.get(), typeIdCol, sql, params...); @@ -37,7 +37,7 @@ namespace IceTray { template<typename Domain, typename... Params> inline Domain - fetch(DB::Connection * c, const IceUtil::Optional<std::string> & typeIdCol, const SqlSource & sql, + fetch(DB::Connection * c, const std::optional<std::string> & typeIdCol, const SqlSource & sql, const Params &... params) { auto s = sql.select(c); |