Merge remote-tracking branch 'origin/master' into flake

This commit is contained in:
Eelco Dolstra
2020-02-03 17:49:01 +01:00
4 changed files with 6 additions and 7 deletions

View File

@@ -23,7 +23,7 @@ struct Connection : pqxx::connection
class receiver : public pqxx::notification_receiver
{
std::experimental::optional<std::string> status;
std::optional<std::string> status;
public:
@@ -35,9 +35,9 @@ public:
status = payload;
};
std::experimental::optional<std::string> get() {
std::optional<std::string> get() {
auto s = status;
status = std::experimental::nullopt;
status = std::nullopt;
return s;
}
};