X-Git-Url: http://pilppa.org/gitweb/?a=blobdiff_plain;f=src%2FData.cc;h=5b7321da097b60e728002da5f842b9943d4c7abd;hb=3d66122db43f2a111b152c0c7b0cdd67cd9f442d;hp=544f3c8c7e9de8791454d9cf8c1cd61a9e5ef9c9;hpb=063ec715601bf9662797725cb39732bea0572d26;p=libplp.git

diff --git a/src/Data.cc b/src/Data.cc
index 544f3c8..5b7321d 100644
--- a/src/Data.cc
+++ b/src/Data.cc
@@ -24,9 +24,9 @@ using namespace plp;
 template <class NumberDataType>
 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<double> *vect_param) {
 	}
 }
 
-Data::Data(std::vector<double> *vector_param, string unit_param) {
+Data::Data(vector<double> *vector_param, string unit_param) {
 	unsigned int	ii;
 	unsigned int	sz;
 
@@ -88,7 +90,7 @@ Data::Data(vector<double> *vector_param,
 	unit	= unit_param;
 }
 
-Data::Data(std::valarray<double> *val_arr_param, Date *date_param) {
+Data::Data(valarray<double> *val_arr_param, Date *date_param) {
 	unsigned int	ii;
 	unsigned int	sz;
 
@@ -360,7 +362,7 @@ void DataRange::printout() {
 	int	ii;
 	Data	*data;
 
-	log_debug("---- DataRange, number of data items: %d\n ----", row_count);
+	log_debug("---- number of data items: %d ----\n", row_count);
 	for (ii = 0; ii < row_count; ii++) {
 		data	= get(ii);
 		if (data != NULL) {
@@ -368,5 +370,5 @@ void DataRange::printout() {
 			delete(data);
 		}
 	}
-	log_debug("---- DataRange printout done ----\n");
+	log_debug("----------------------\n");
 }