From 2386a72bff93ff0daa540d9bcef2c29c82a3e8b8 Mon Sep 17 00:00:00 2001 From: Wolfgang Bangerth Date: Mon, 6 Apr 1998 09:04:32 +0000 Subject: [PATCH] Use standard c++ strings rather than those from libg++. git-svn-id: https://svn.dealii.org/trunk@139 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/deal.II/include/numerics/data_io.h | 20 ++++++-------------- deal.II/deal.II/source/numerics/data_io.cc | 10 +++++----- 2 files changed, 11 insertions(+), 19 deletions(-) diff --git a/deal.II/deal.II/include/numerics/data_io.h b/deal.II/deal.II/include/numerics/data_io.h index e77800bab8..5900fe744e 100644 --- a/deal.II/deal.II/include/numerics/data_io.h +++ b/deal.II/deal.II/include/numerics/data_io.h @@ -6,15 +6,7 @@ #include #include - -#ifdef DEBUG -# define _G_NO_NRV // don't use GNU's named return values in debug modes -# include // because if we did we'd harvest tons of warnings. -# undef _G_NO_NRV -#else -# include -#endif - +#include template class Triangulation; template class DoFHandler; @@ -360,8 +352,8 @@ class DataOut { * at present. */ void add_data_vector (const dVector &data, - const String &name, - const String &units=""); + const string &name, + const string &units=""); /** * Release the pointers to the data @@ -419,7 +411,7 @@ class DataOut { /** * Constructor */ - DataEntry (const dVector *data, const String name, const String units); + DataEntry (const dVector *data, const string name, const string units); /** * Pointer to the data vector. @@ -428,12 +420,12 @@ class DataOut { /** * Name of this component. */ - String name; + string name; /** * Physical unit name of this * component. */ - String units; + string units; }; /** diff --git a/deal.II/deal.II/source/numerics/data_io.cc b/deal.II/deal.II/source/numerics/data_io.cc index 393f8af930..f56716c4a5 100644 --- a/deal.II/deal.II/source/numerics/data_io.cc +++ b/deal.II/deal.II/source/numerics/data_io.cc @@ -103,7 +103,7 @@ void DataIn::read_ucd (istream &in) { for (unsigned int cell=0; cell> dummy // cell number @@ -184,8 +184,8 @@ DataOut::DataEntry::DataEntry () : template DataOut::DataEntry::DataEntry (const dVector *data, - const String name, - const String units) : + const string name, + const string units) : data(data), name(name), units(units) {}; @@ -206,8 +206,8 @@ void DataOut::attach_dof_handler (DoFHandler &d) { template void DataOut::add_data_vector (const dVector &vec, - const String &name, - const String &units) { + const string &name, + const string &units) { DataEntry new_entry (&vec, name, units); data.push_back (new_entry); }; -- 2.39.5