#include <base/exceptions.h>
#include <vector.h>
-
-#ifdef DEBUG
-# define _G_NO_NRV // don't use GNU's named return values in debug modes
-# include <String.h> // because if we did we'd harvest tons of warnings.
-# undef _G_NO_NRV
-#else
-# include <String.h>
-#endif
-
+#include <string>
template <int dim> class Triangulation;
template <int dim> class DoFHandler;
* at present.
*/
void add_data_vector (const dVector &data,
- const String &name,
- const String &units="<dimensionless>");
+ const string &name,
+ const string &units="<dimensionless>");
/**
* Release the pointers to the data
/**
* 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.
/**
* Name of this component.
*/
- String name;
+ string name;
/**
* Physical unit name of this
* component.
*/
- String units;
+ string units;
};
/**
for (unsigned int cell=0; cell<n_cells; ++cell)
{
- String cell_type;
+ string cell_type;
int material_id;
in >> dummy // cell number
template <int dim>
DataOut<dim>::DataEntry::DataEntry (const dVector *data,
- const String name,
- const String units) :
+ const string name,
+ const string units) :
data(data), name(name), units(units) {};
template <int dim>
void DataOut<dim>::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);
};