From 9b60c502962ef76535b232746469224ab3d76100 Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Sun, 30 Aug 2009 16:27:50 +0000
Subject: [PATCH] GetCommandLine clashes with windows internals
---
Common/Gmsh.cpp | 2 +-
Common/GmshMessage.h | 2 +-
Fltk/Main.cpp | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/Common/Gmsh.cpp b/Common/Gmsh.cpp
index 5cb965da04..ec5f8a089a 100644
--- a/Common/Gmsh.cpp
+++ b/Common/Gmsh.cpp
@@ -103,7 +103,7 @@ int GmshFinalize()
int GmshBatch()
{
- Msg::Info("Running '%s'", Msg::GetCommandLine().c_str());
+ Msg::Info("Running '%s'", Msg::GetCommandLineArgs().c_str());
Msg::Info("Started on %s", Msg::GetLaunchDate().c_str());
OpenProject(GModel::current()->getFileName());
diff --git a/Common/GmshMessage.h b/Common/GmshMessage.h
index b6f475a39b..8cd2905723 100644
--- a/Common/GmshMessage.h
+++ b/Common/GmshMessage.h
@@ -52,7 +52,7 @@ class Msg {
static void SetVerbosity(int val){ _verbosity = val; }
static int GetVerbosity(){ return _verbosity; }
static std::string GetLaunchDate(){ return _launchDate; }
- static std::string GetCommandLine(){ return _commandLine; }
+ static std::string GetCommandLineArgs(){ return _commandLine; }
static void Fatal(const char *fmt, ...);
static void Error(const char *fmt, ...);
static void Warning(const char *fmt, ...);
diff --git a/Fltk/Main.cpp b/Fltk/Main.cpp
index de880f7f17..0ed4d5d912 100644
--- a/Fltk/Main.cpp
+++ b/Fltk/Main.cpp
@@ -66,7 +66,7 @@ int main(int argc, char *argv[])
Msg::Info("Packager : %s", GetGmshPackager());
Msg::Info("Home directory : %s", CTX::instance()->homeDir.c_str());
Msg::Info("Launch date : %s", Msg::GetLaunchDate().c_str());
- Msg::Info("Command line : %s", Msg::GetCommandLine().c_str());
+ Msg::Info("Command line : %s", Msg::GetCommandLineArgs().c_str());
Msg::Info("-------------------------------------------------------");
// Display the GUI immediately to have a quick "a la Windows" launch time
--
GitLab