X-Git-Url: http://pilppa.org/gitweb/?a=blobdiff_plain;f=src%2FData.cc;h=69c2c0fbf128ba2af10a177f6e36bb7b63499215;hb=97671ad08a864c833fab1b3827e3d91749c0e9d7;hp=544f3c8c7e9de8791454d9cf8c1cd61a9e5ef9c9;hpb=063ec715601bf9662797725cb39732bea0572d26;p=libplp.git diff --git a/src/Data.cc b/src/Data.cc index 544f3c8..69c2c0f 100644 --- a/src/Data.cc +++ b/src/Data.cc @@ -24,9 +24,9 @@ using namespace plp; template bool string_to_number(NumberDataType& result, const string& string_param, - std::ios_base& (*format)(std::ios_base&)) + ios_base& (*format)(ios_base&)) { - std::istringstream iss(string_param); + istringstream iss(string_param); return !(iss >> format >> result).fail(); } @@ -34,7 +34,9 @@ Data::Data(int size) { value_arr.resize(size); } -Data::Data(int size, double default_value, string unit_param) { +Data::Data(int size, + double default_value, + string unit_param) { int ii; value_arr.resize(size); @@ -57,7 +59,7 @@ Data::Data(vector *vect_param) { } } -Data::Data(std::vector *vector_param, string unit_param) { +Data::Data(vector *vector_param, string unit_param) { unsigned int ii; unsigned int sz; @@ -88,7 +90,7 @@ Data::Data(vector *vector_param, unit = unit_param; } -Data::Data(std::valarray *val_arr_param, Date *date_param) { +Data::Data(valarray *val_arr_param, Date *date_param) { unsigned int ii; unsigned int sz;