diff --git a/IO/silo.cpp b/IO/silo.cpp index 2d44d158..77053382 100644 --- a/IO/silo.cpp +++ b/IO/silo.cpp @@ -171,7 +171,7 @@ void writeMultiMesh( DBfile* fid, const std::string& meshname, std::string tree_name = meshname + "_tree"; DBoptlist *optList = DBMakeOptlist( 1 ); DBAddOption( optList, DBOPT_MRGTREE_NAME, (char *) tree_name.c_str() ); - DBPutMultimesh( fid, meshname.c_str(), meshNames.size(), meshnames.data(), meshTypes.data(), nullptr ); + DBPutMultimesh( fid, meshname.c_str(), meshNames.size(), meshnames.data(), (int*) meshTypes.data(), nullptr ); DBFreeOptlist( optList ); } diff --git a/common/imfilter.hpp b/common/imfilter.hpp index 3152bfc7..fb797aae 100644 --- a/common/imfilter.hpp +++ b/common/imfilter.hpp @@ -134,7 +134,7 @@ Array imfilter::create_filter( const std::vector& N0, const std::stri TYPE std[3] = { 0.5, 0.5, 0.5 }; if ( args != NULL ) { const TYPE *args2 = reinterpret_cast( args ); - for ( int d = 0; d < N0.size(); d++ ) + for ( size_t d = 0; d < N0.size(); d++ ) std[d] = args2[d]; } auto N = N0; @@ -310,8 +310,8 @@ Array imfilter::imfilter_separable( const Array& A, const std::vector& boundary, const TYPE X ) { PROFILE_START( "imfilter_separable" ); - IMFILTER_ASSERT( A.ndim() == H.size() ); - IMFILTER_ASSERT( A.ndim() == boundary.size() ); + IMFILTER_ASSERT( A.ndim() == (int) H.size() ); + IMFILTER_ASSERT( A.ndim() == (int) boundary.size() ); std::vector Nh( H.size() ); for (int d=0; d imfilter::imfilter_separable( const Array& A, const std::vecto const std::vector& boundary, const TYPE X ) { PROFILE_START( "imfilter_separable (lambda)" ); - IMFILTER_ASSERT( A.ndim() == boundary.size() ); + IMFILTER_ASSERT( A.ndim() == (int) boundary.size() ); auto B = A; for ( int d = 0; d < A.ndim(); d++ ) { int N = A.size(d); @@ -359,7 +359,7 @@ Array imfilter::imfilter_separable( const Array& A, const std::vecto const std::vector& boundary, const TYPE X ) { PROFILE_START( "imfilter_separable (function)" ); - IMFILTER_ASSERT( A.ndim() == boundary.size() ); + IMFILTER_ASSERT( A.ndim() == (int) boundary.size() ); auto B = A; for ( int d = 0; d < A.ndim(); d++ ) { int N = A.size(d);