From ae4314c744c3eac1069380a3aace07782cca50f1 Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Mon, 3 Mar 2014 08:34:51 +0000
Subject: [PATCH] CreateDirectory is reserved by windows -> CreateSingleDir
---
Common/OS.cpp | 4 ++--
Common/OS.h | 2 +-
Parser/Gmsh.tab.cpp | 2 +-
Parser/Gmsh.y | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/Common/OS.cpp b/Common/OS.cpp
index 3b0f4bb6c9..a95d30e3ca 100644
--- a/Common/OS.cpp
+++ b/Common/OS.cpp
@@ -339,7 +339,7 @@ int StatFile(const std::string &fileName)
return ret;
}
-int CreateDirectory(const std::string &dirName)
+int CreateSingleDir(const std::string &dirName)
{
#if defined(WIN32) && !defined(__CYGWIN__)
setwbuf(0, dirName.c_str());
@@ -358,7 +358,7 @@ void CreatePath(const std::string &fullPath)
size_t cur = 0;
while(cur != std::string::npos) {
cur = dirname.find("/", cur + 1);
- CreateDirectory(dirname.substr(0, cur));
+ CreateSingleDir(dirname.substr(0, cur));
}
}
diff --git a/Common/OS.h b/Common/OS.h
index 6c9fc46901..685005bc47 100644
--- a/Common/OS.h
+++ b/Common/OS.h
@@ -22,7 +22,7 @@ std::string GetHostName();
int UnlinkFile(const std::string &fileName);
int StatFile(const std::string &fileName);
int KillProcess(int pid);
-int CreateDirectory(const std::string &dirName);
+int CreateSingleDir(const std::string &dirName);
void CreatePath(const std::string &fullPath);
int SystemCall(const std::string &command, bool blocking=false);
std::string GetCurrentWorkdir();
diff --git a/Parser/Gmsh.tab.cpp b/Parser/Gmsh.tab.cpp
index 39358fcdde..4b110de3b3 100644
--- a/Parser/Gmsh.tab.cpp
+++ b/Parser/Gmsh.tab.cpp
@@ -7444,7 +7444,7 @@ yyreduce:
GModel::current()->setName((yyvsp[(2) - (3)].c));
}
else if(!strcmp((yyvsp[(1) - (3)].c), "CreateDir")){
- CreateDirectory(std::string((yyvsp[(2) - (3)].c)));
+ CreateSingleDir(std::string((yyvsp[(2) - (3)].c)));
}
else{
yymsg(0, "Unknown command '%s'", (yyvsp[(1) - (3)].c));
diff --git a/Parser/Gmsh.y b/Parser/Gmsh.y
index 3c888b48a8..a98d1ddf36 100644
--- a/Parser/Gmsh.y
+++ b/Parser/Gmsh.y
@@ -2764,7 +2764,7 @@ Command :
GModel::current()->setName($2);
}
else if(!strcmp($1, "CreateDir")){
- CreateDirectory(std::string($2));
+ CreateSingleDir(std::string($2));
}
else{
yymsg(0, "Unknown command '%s'", $1);
--
GitLab