From 2fb9aa2a60b2643221e54a92edcdbba5bec69743 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Villemot?= <sebastien@dynare.org>
Date: Tue, 11 Oct 2022 11:23:26 +0200
Subject: [PATCH] Minor simplification using argument dependent lookup (ADL)
---
src/DynamicModel.cc | 4 ++--
src/ModFile.cc | 14 +++++++-------
src/StaticModel.cc | 4 ++--
3 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/src/DynamicModel.cc b/src/DynamicModel.cc
index 75a79827..096537a9 100644
--- a/src/DynamicModel.cc
+++ b/src/DynamicModel.cc
@@ -3471,8 +3471,8 @@ DynamicModel::writeDynamicFile(const string &basename, bool block, bool use_dll,
filesystem::path model_dir{basename};
model_dir /= "model";
if (use_dll)
- filesystem::create_directories(model_dir / "src");
- filesystem::create_directories(model_dir / "bytecode");
+ create_directories(model_dir / "src");
+ create_directories(model_dir / "bytecode");
if (block)
{
diff --git a/src/ModFile.cc b/src/ModFile.cc
index a3a4b226..6e989c09 100644
--- a/src/ModFile.cc
+++ b/src/ModFile.cc
@@ -793,19 +793,19 @@ ModFile::writeMOutput(const string &basename, bool clear_all, bool clear_global,
it before deleting it (the renaming must occur in the same directory,
otherwise it may file if the destination is not on the same
filesystem). */
- if (filesystem::path plusfolder{"+" + basename}; filesystem::exists(plusfolder))
+ if (filesystem::path plusfolder{"+" + basename}; exists(plusfolder))
{
- if (filesystem::exists(plusfolder / "+objective"))
+ if (exists(plusfolder / "+objective"))
{
// Do it recursively for the +objective folder, created by ramsey_policy
auto tmp2 = unique_path();
- filesystem::rename(plusfolder / "+objective", tmp2);
- filesystem::remove_all(tmp2);
+ rename(plusfolder / "+objective", tmp2);
+ remove_all(tmp2);
}
auto tmp = unique_path();
- filesystem::rename(plusfolder, tmp);
- filesystem::remove_all(tmp);
+ rename(plusfolder, tmp);
+ remove_all(tmp);
}
filesystem::remove_all(basename + "/model/src");
filesystem::remove_all(basename + "/model/bytecode");
@@ -1408,7 +1408,7 @@ ModFile::unique_path()
dis = possible_characters[distribution(generator)];
path = rand_str;
}
- while (filesystem::exists(path));
+ while (exists(path));
return path;
}
diff --git a/src/StaticModel.cc b/src/StaticModel.cc
index b01230b5..f4d24f70 100644
--- a/src/StaticModel.cc
+++ b/src/StaticModel.cc
@@ -844,8 +844,8 @@ StaticModel::writeStaticFile(const string &basename, bool block, bool use_dll, c
filesystem::path model_dir{basename};
model_dir /= "model";
if (use_dll)
- filesystem::create_directories(model_dir / "src");
- filesystem::create_directories(model_dir / "bytecode");
+ create_directories(model_dir / "src");
+ create_directories(model_dir / "bytecode");
if (block)
{
--
GitLab