tursom/memgraph
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Migrate to C++17

Browse Source 
Reviewers: teon.banek, buda

Reviewed By: teon.banek

Subscribers: pullbot

Differential Revision: https://phabricator.memgraph.io/D1974
This commit is contained in:
Matej Ferencevic
2019-04-23 11:00:49 +02:00
parent 75ffcc4ee9
commit 9291a5fc4d
222 changed files with 1388 additions and 1571 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
tests/manual/interactive_planning.cpp
View File

@@ -2,7 +2,7 @@
#include <chrono>
#include <cstdlib>
#include <experimental/optional>
#include <optional>
#include <string>
#include <gflags/gflags.h>
@@ -40,9 +40,9 @@ DEFINE_string(load_mock_db_file, "",
* @param prompt The prompt to display.
* @return A single command the user entered, or nullopt on EOF.
*/
std::experimental::optional<std::string> ReadLine(const std::string &prompt) {
std::optional<std::string> ReadLine(const std::string &prompt) {
char *line = readline(prompt.c_str());
if (!line) return std::experimental::nullopt;
if (!line) return std::nullopt;
if (*line) add_history(line);
std::string r_val(line);
@@ -52,11 +52,11 @@ std::experimental::optional<std::string> ReadLine(const std::string &prompt) {
#else
std::experimental::optional<std::string> ReadLine(const std::string &prompt) {
std::optional<std::string> ReadLine(const std::string &prompt) {
std::cout << prompt;
std::string line;
std::getline(std::cin, line);
if (std::cin.eof()) return std::experimental::nullopt;
if (std::cin.eof()) return std::nullopt;
return line;
}
@@ -181,8 +181,8 @@ class InteractiveDbAccessor {
int64_t VerticesCount(
storage::Label label_id, storage::Property property_id,
const std::experimental::optional<utils::Bound<PropertyValue>> lower,
const std::experimental::optional<utils::Bound<PropertyValue>> upper) {
const std::optional<utils::Bound<PropertyValue>> lower,
const std::optional<utils::Bound<PropertyValue>> upper) {
auto label = dba_->LabelName(label_id);
auto property = dba_->PropertyName(property_id);
std::stringstream range_string;
@@ -490,8 +490,7 @@ auto MakeLogicalPlans(query::CypherQuery *query, query::AstStorage &ast,
void RunInteractivePlanning(database::GraphDbAccessor *dba) {
auto in_db_filename = utils::Trim(FLAGS_load_mock_db_file);
if (!in_db_filename.empty() &&
!std::experimental::filesystem::exists(in_db_filename)) {
if (!in_db_filename.empty() && !std::filesystem::exists(in_db_filename)) {
std::cerr << "File '" << in_db_filename << "' does not exist!" << std::endl;
std::exit(EXIT_FAILURE);
}