Merge branch '174-refactor-eliminate-compile-warnings' into staging

Author: steven-varga

examples/CMakeLists.txt

@@ -149,13 +149,17 @@ target_link_libraries(examples-xtensor ${LIBS} libxtensor)
 add_dependencies(examples examples-xtensor)
 
 find_package(BLAS)
-if(BLAS_FOUND)
+if(BLAS_FOUND AND XFLENS_FOUND)
     message( "-- Vendored: xtensor-blas added to examples" )
     add_executable(examples-xtensor-blas EXCLUDE_FROM_ALL "linalg/xtensor-blas.cpp")
     target_link_libraries(examples-xtensor-blas ${LIBS} libxtensor-blas ${BLAS_LIBRARIES})
     add_dependencies(examples examples-xtensor-blas)
 else()
-    message("-- BLAS not found — xtensor-blas example disabled")
+    if(BLAS_FOUND)
+        message("-- xflens not found — xtensor-blas example disabled")
+    else()
+        message("-- BLAS not found — xtensor-blas example disabled")
+    endif()
 endif()
 
 # ublas headers are vendored but rely on system Boost config/compiler headers

examples/basics/basics.cpp

@@ -69,9 +69,10 @@ int main(){
 		// h5::lcpl_t lcpl = h5::create_path | h5::utf8; 
 	}
 	{ // all resources follow RAII idiom / managed
-		h5::fd_t fd = h5::create("001.h5", H5F_ACC_TRUNC);  // f5::fd_t is managed resource, will call H5Fclose upon leaving code block
-		hid_t ref = static_cast<hid_t>( fd ); 			    // static cast to hid_t is always allowed, ref must be treated as managed reference, 
-										  				    // must not call CAPI H5Fclose( ref )  on it. This explicit or implicit conversion 
+			h5::fd_t fd = h5::create("001.h5", H5F_ACC_TRUNC);  // f5::fd_t is managed resource, will call H5Fclose upon leaving code block
+			hid_t ref = static_cast<hid_t>( fd ); 			    // static cast to hid_t is always allowed, ref must be treated as managed reference,
+			(void)ref;
+			// must not call CAPI H5Fclose( ref )  on it. This explicit or implicit conversion
 										  				    // is to support CAPI interop.   
 	}
 	{ // file create example: 
@@ -108,4 +109,3 @@ int main(){
 	}
 
 }
-

examples/compound/utils.hpp

@@ -9,13 +9,13 @@ namespace h5::utils {
 	// template specialization 
 	template <> inline  std::vector<sn::example::Record> get_test_data( size_t n ){
 		std::vector<sn::example::Record> vec (n);
-		for(int i=0; i<n; i++ )
+		for(size_t i=0; i<n; i++ )
 			vec[i].idx = i;
 		return vec;
 	}
 	template <> inline  std::vector<int> get_test_data( size_t n ){
 		std::vector<int> vec (n);
-		for(int i=0; i<n; i++ )
+		for(size_t i=0; i<n; i++ )
 			vec[i] = i;
 		return vec;
 	}

examples/csv/csv.h

@@ -73,11 +73,10 @@ namespace io{
                                 std::memset(file_name, 0, sizeof(file_name));
                         }
 
-                        void set_file_name(const char*file_name){
-                                if(file_name != nullptr){
-                                        strncpy(this->file_name, file_name, sizeof(this->file_name));
-                                        this->file_name[sizeof(this->file_name)-1] = '\0';
-                                }else{
+	                        void set_file_name(const char*file_name){
+	                                if(file_name != nullptr){
+	                                        std::snprintf(this->file_name, sizeof(this->file_name), "%s", file_name);
+	                                }else{
                                         this->file_name[0] = '\0';
                                 }
                         }
@@ -420,11 +419,10 @@ namespace io{
                         set_file_name(file_name.c_str());
                 }
 
-                void set_file_name(const char*file_name){
-                        if(file_name != nullptr){
-                                strncpy(this->file_name, file_name, sizeof(this->file_name));
-                                this->file_name[sizeof(this->file_name)-1] = '\0';
-                        }else{
+	                void set_file_name(const char*file_name){
+	                        if(file_name != nullptr){
+	                                std::snprintf(this->file_name, sizeof(this->file_name), "%s", file_name);
+	                        }else{
                                 this->file_name[0] = '\0';
                         }
                 }
@@ -1265,4 +1263,3 @@ namespace io{
         };
 }
 #endif
-

examples/csv/csv2hdf5.cpp

@@ -34,7 +34,8 @@ int main(){
 	input_t row;                           // buffer to read line by line
 	char* ptr;      // indirection, as `read_row` doesn't take array directly
 	while(in.read_row(row.MasterRecordNumber, row.Hour, ptr, row.Latitude, row.Longitude)){
-		strncpy(row.ReportedLocation, ptr, STR_ARRAY_SIZE); // defined in struct.h
+		memset(row.ReportedLocation, 0, STR_ARRAY_SIZE);
+		strncpy(row.ReportedLocation, ptr, STR_ARRAY_SIZE - 1); // defined in struct.h
 		h5::append(pt, row);
 		std::cout << std::string(ptr) << "\n";
 	}

examples/datatypes/n-bit.cpp

@@ -75,11 +75,10 @@ int main(){
 		h5::write<bs::n_bit>(ds, V.data(), h5::count{12,8}); // single shot write
 
 		auto data = h5::read<std::vector<bs::n_bit>>(fd, "stl");
-		for( int i=0; i<V.size(); i++ )
+		for( size_t i=0; i<V.size(); i++ )
 			std::cout << static_cast<unsigned int>( data[i] ) << " ";
 		std::cout << "\n\ncomputing difference ||saved - read|| expecting norm to be zero:\n";
-		for( int i=0; i<V.size(); i++ )
+		for( size_t i=0; i<V.size(); i++ )
 			std::cout << abs(V[i].value - data[i].value) <<" ";
 	}
 }
-

examples/datatypes/n-bit.hpp

@@ -51,10 +51,9 @@ std::ostream& operator<<(std::ostream& os, const bitstring::n_bit& data){
 
 std::ostream& operator<<(std::ostream& os, const
 	 Eigen::Matrix<bitstring::n_bit, Eigen::Dynamic, Eigen::Dynamic, Eigen::RowMajor>& M){
-	for( size_t i=0; i<M.rows(); i++){
-	   	for( size_t j=0; j<M.cols(); j++) os << static_cast<unsigned int>( M(i,j)) <<" ";
+	for( Eigen::Index i=0; i<M.rows(); i++){
+		for( Eigen::Index j=0; j<M.cols(); j++) os << static_cast<unsigned int>( M(i,j)) <<" ";
 		os<<std::endl;
 	}
 	return os;
 }
-

examples/datatypes/two-bit.cpp

@@ -25,10 +25,9 @@ int main(){
 	h5::write(fd,"data", vec); // single shot write
 	auto data = h5::read<std::vector<nm::two_bit>>(fd, "data");
 
-	for( int i=0; i<vec.size(); i++ )
+	for( size_t i=0; i<vec.size(); i++ )
 		std::cout << "[" << i << ": " << vec[i] << " "  <<"]";
 	std::cout << "\n\ncomputing difference ||saved - read|| expecting norm to be zero:\n";
-	for( int i=0; i<vec.size(); i++ )
+	for( size_t i=0; i<vec.size(); i++ )
 		std::cout << abs(vec[i].value - data[i].value) <<" ";
 }
-

examples/multi-tu/utils.hpp

@@ -10,7 +10,7 @@ namespace h5 { namespace utils {
 	// template specialization 
 	template <> inline  std::vector<sn::example::Record> get_test_data( size_t n ){
 		std::vector<sn::example::Record> vec (n);
-		for(int i=0; i<n; i++ )
+		for(size_t i=0; i<n; i++ )
 			vec[i].idx = i;
 		return vec;
 	}

examples/packet-table/utils.hpp

@@ -10,7 +10,7 @@ namespace h5 { namespace utils {
 	// template specialization 
 	template <> inline  std::vector<sn::example::Record> get_test_data( size_t n ){
 		std::vector<sn::example::Record> vec (n);
-		for(int i=0; i<n; i++ )
+		for(size_t i=0; i<n; i++ )
 			vec[i].idx = i;
 		return vec;
 	}