X-Git-Url: http://pilppa.org/gitweb/?a=blobdiff_plain;f=src%2FData.cc;h=388dbefa71471c3910b680972abba3ac2361b6e6;hb=83dba70b46600014932da34e8744ba70584077aa;hp=98425c63d64d63b0506f47b4d2602765c1129cb0;hpb=9c47855d3ddc3d09b9733c43d420a7d5b739bd37;p=lib1wire.git

diff --git a/src/Data.cc b/src/Data.cc
index 98425c6..388dbef 100644
--- a/src/Data.cc
+++ b/src/Data.cc
@@ -45,13 +45,13 @@ Data::Data(int size, double default_value) {
 }
 
 Data::Data(vector<double> vector_param, Date *date_param) {
-	int	ii;
-	int	size;
+	unsigned int	ii;
+	unsigned int	size;
 
 	size	= vector_param.size();
 	//log_debug("Data(), value count: %d\n", size);
 	value_arr.resize(size);
-	for (int ii = 0; ii < vector_param.size(); ii++) {
+	for (ii = 0; ii < vector_param.size(); ii++) {
 		value_arr[ii]	= vector_param.at(ii);
 		//log_debug("Data(), value[%d]: %f\n", ii, value_arr[ii]);
 	}
@@ -59,8 +59,11 @@ Data::Data(vector<double> vector_param, Date *date_param) {
 }
 
 Data::Data(std::valarray<double> value_arr_param, Date *date_param) {
+	unsigned int ii;
+
 	value_arr.resize(value_arr_param.size());
-	for (int ii = 0; ii < value_arr_param.size(); ii++) {
+
+	for (ii = 0; ii < value_arr_param.size(); ii++) {
 		value_arr[ii]	= value_arr_param[ii];
 	}
 	date_time.copy(date_param);
@@ -78,7 +81,7 @@ void Data::set_date(plp::Date date) {
 }
 
 void Data::printout() {
-	int	ii;
+	unsigned int	ii;
 
 	date_time.printout();
 	for (ii = 0; ii < value_arr.size(); ii++) {
@@ -131,8 +134,8 @@ DataRange::DataRange(Data data) {
 }
 
 DataRange::~DataRange() {
-	int	ii;
-	Date	*date;
+	unsigned int	ii;
+	Date		*date;
 
 	if (val_matrix != NULL) {
 		free(val_matrix);
@@ -145,10 +148,9 @@ DataRange::~DataRange() {
 }
 
 void DataRange::add_data(Data data) {
-	int			ii;
-	int			r_count;
-	int			indx;
-	Date			date;
+	unsigned int	ii;
+	int		indx;
+	Date		date;
 
 	//log_debug("old row_count: %d, column_count: %d, value_arr_size: %d\n", row_count, column_count, data.value_arr.size());
 	val_matrix	= (double *)realloc(val_matrix, ((row_count + 1) * column_count) * sizeof(double));