From c1e5e13440c81d8fdb2b77e8da9b4a452254e530 Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Wed, 9 Apr 2014 07:25:21 +0000
Subject: [PATCH] IO.h -> GmshIO.h for Windows
---
Geo/GModelIO_UNV.cpp | 6 +++---
Parser/Gmsh.l | 2 +-
Parser/Gmsh.yy.cpp | 2 +-
Parser/Parser.h | 2 +-
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/Geo/GModelIO_UNV.cpp b/Geo/GModelIO_UNV.cpp
index b2d615f87e..03bb8e1323 100644
--- a/Geo/GModelIO_UNV.cpp
+++ b/Geo/GModelIO_UNV.cpp
@@ -7,7 +7,7 @@
#include <string.h>
#include "GModel.h"
#include "OS.h"
-#include "IO.h"
+#include "GmshIO.h"
#include "MLine.h"
#include "MTriangle.h"
@@ -92,9 +92,9 @@ int GModel::readUNV(const std::string &name)
std::vector<MVertex*> vertices(numNodes);
for(int i = 0; i < numNodes; i++){
int n;
- if(!gmshgets(buffer, 11, fp)){ gmshclose(fp); return 0; }
+ if(!gmshgets(buffer, 11, fp)){ gmshclose(fp); return 0; }
if(strlen(buffer) < 10)
- if(!gmshgets(buffer, 11, fp)){ gmshclose(fp); return 0; }
+ if(!gmshgets(buffer, 11, fp)){ gmshclose(fp); return 0; }
if(!sscanf(buffer, "%d", &n)){ gmshclose(fp); return 0; }
vertices[i] = getMeshVertexByTag(n);
if(!vertices[i]){
diff --git a/Parser/Gmsh.l b/Parser/Gmsh.l
index 276abf9e75..29d34073e3 100644
--- a/Parser/Gmsh.l
+++ b/Parser/Gmsh.l
@@ -12,7 +12,7 @@
#include "GmshMessage.h"
#include "Geo.h"
#include "Gmsh.tab.hpp"
-#include "IO.h"
+#include "GmshIO.h"
void parsestring(char endchar);
char *strsave(char *ptr);
diff --git a/Parser/Gmsh.yy.cpp b/Parser/Gmsh.yy.cpp
index 94325fda20..f3ef8da728 100644
--- a/Parser/Gmsh.yy.cpp
+++ b/Parser/Gmsh.yy.cpp
@@ -1023,7 +1023,7 @@ char *gmsh_yytext;
#include "GmshMessage.h"
#include "Geo.h"
#include "Gmsh.tab.hpp"
-#include "IO.h"
+#include "GmshIO.h"
void parsestring(char endchar);
char *strsave(char *ptr);
diff --git a/Parser/Parser.h b/Parser/Parser.h
index b5308eb55e..9c26d51746 100644
--- a/Parser/Parser.h
+++ b/Parser/Parser.h
@@ -10,7 +10,7 @@
#include <string>
#include <vector>
-#include "IO.h"
+#include "GmshIO.h"
int gmsh_yyparse();
int gmsh_yylex();
--
GitLab