From 6534e0b18a87a8c286a65da1252a3fccdc2dedfd Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Tue, 6 Jan 2009 23:23:31 +0000
Subject: [PATCH] *** empty log message ***
---
Fltk/fieldWindow.cpp | 4 ++--
Fltk/visibilityWindow.cpp | 2 +-
Geo/GeoStringInterface.cpp | 2 +-
Graphics/drawGraph2d.cpp | 2 +-
Mesh/Makefile | 2 +-
5 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/Fltk/fieldWindow.cpp b/Fltk/fieldWindow.cpp
index b3e1789d72..fa00aecace 100644
--- a/Fltk/fieldWindow.cpp
+++ b/Fltk/fieldWindow.cpp
@@ -258,8 +258,8 @@ void fieldWindow::saveFieldOptions()
break;
}
if((*input)->changed()){
- add_field_option(f->id, it->first.c_str(), sstream.str().c_str(),
- GModel::current()->getFileName());
+ add_field_option
+ (f->id, it->first, sstream.str(), GModel::current()->getFileName());
(*input)->clear_changed();
}
input++;
diff --git a/Fltk/visibilityWindow.cpp b/Fltk/visibilityWindow.cpp
index b60091337c..e13dd01d5d 100644
--- a/Fltk/visibilityWindow.cpp
+++ b/Fltk/visibilityWindow.cpp
@@ -738,7 +738,7 @@ static void visibility_save_cb(Fl_Widget *w, void *data)
}
}
str += "}\n";
- add_infile(str.c_str(), GModel::current()->getFileName());
+ add_infile(str, GModel::current()->getFileName());
}
static void _set_visibility_by_number(int what, int num, char val, bool recursive)
diff --git a/Geo/GeoStringInterface.cpp b/Geo/GeoStringInterface.cpp
index df5238db03..7900528e4c 100644
--- a/Geo/GeoStringInterface.cpp
+++ b/Geo/GeoStringInterface.cpp
@@ -135,7 +135,7 @@ void add_charlength(List_T *list, std::string filename, std::string lc)
{
std::ostringstream sstream;
sstream << "Characteristic Length {" << list2string(list) << "} = " << lc << ";";
- add_infile(sstream.str().c_str(), filename);
+ add_infile(sstream.str(), filename);
}
void add_recosurf(List_T *list, std::string filename)
diff --git a/Graphics/drawGraph2d.cpp b/Graphics/drawGraph2d.cpp
index c9a627fb0b..7d19185273 100644
--- a/Graphics/drawGraph2d.cpp
+++ b/Graphics/drawGraph2d.cpp
@@ -45,7 +45,7 @@ void drawContext::drawText2d()
data->getString2D(j, opt->TimeStep, str, x, y, style);
fix2dCoordinates(&x, &y);
glRasterPos2d(x, y);
- drawString(str.c_str(), style);
+ drawString(str, style);
}
}
}
diff --git a/Mesh/Makefile b/Mesh/Makefile
index dd505c04db..6e8963da99 100644
--- a/Mesh/Makefile
+++ b/Mesh/Makefile
@@ -446,7 +446,7 @@ Partition${OBJEXT}: Partition.cpp ../Geo/GModel.h ../Geo/GVertex.h \
../Geo/SVector3.h ../Geo/MFace.h ../Geo/MVertex.h ../Geo/SVector3.h \
../Common/GmshMessage.h ../Numeric/FunctionSpace.h \
../Numeric/GmshMatrix.h ../Numeric/Gauss.h PartitionOptions.h
-Refine${OBJEXT}: Refine.cpp HighOrder.h ../Geo/GModel.h ../Geo/GVertex.h \
+meshRefine${OBJEXT}: meshRefine.cpp HighOrder.h ../Geo/GModel.h ../Geo/GVertex.h \
../Geo/GEntity.h ../Geo/Range.h ../Geo/SPoint3.h \
../Geo/SBoundingBox3d.h ../Geo/SPoint3.h ../Geo/GPoint.h \
../Geo/SPoint2.h ../Geo/GEdge.h ../Geo/GEntity.h ../Geo/GVertex.h \
--
GitLab