From f22c27e9778bbb9bb9990af6f435bd6840ac41e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tam=C3=A1s=20B=C3=A1lint=20Misius?= Date: Wed, 4 Sep 2019 14:52:38 +0200 Subject: [PATCH] Fix VS warning complaining about std::fill(float *, float *, int) --- src/simulation/Gravity.cpp | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/src/simulation/Gravity.cpp b/src/simulation/Gravity.cpp index 4fc74e0b0..cc51319ce 100755 --- a/src/simulation/Gravity.cpp +++ b/src/simulation/Gravity.cpp @@ -180,7 +180,7 @@ void Gravity::gravity_update_async() unsigned int size = (XRES / CELL) * (YRES / CELL); membwand(gravy, gravmask, size * sizeof(float), size * sizeof(unsigned)); membwand(gravx, gravmask, size * sizeof(float), size * sizeof(unsigned)); - std::fill(&gravmap[0], &gravmap[size], 0); + std::fill(&gravmap[0], &gravmap[size], 0.0f); } void Gravity::update_grav_async() @@ -188,11 +188,11 @@ void Gravity::update_grav_async() int done = 0; int thread_done = 0; unsigned int size = (XRES / CELL) * (YRES / CELL); - std::fill(&th_ogravmap[0], &th_ogravmap[size], 0); - std::fill(&th_gravmap[0], &th_gravmap[size], 0); - std::fill(&th_gravy[0], &th_gravy[size], 0); - std::fill(&th_gravx[0], &th_gravx[size], 0); - std::fill(&th_gravp[0], &th_gravp[size], 0); + std::fill(&th_ogravmap[0], &th_ogravmap[size], 0.0f); + std::fill(&th_gravmap[0], &th_gravmap[size], 0.0f); + std::fill(&th_gravy[0], &th_gravy[size], 0.0f); + std::fill(&th_gravx[0], &th_gravx[size], 0.0f); + std::fill(&th_gravp[0], &th_gravp[size], 0.0f); #ifdef GRAVFFT if (!grav_fft_status) @@ -231,10 +231,10 @@ void Gravity::start_grav_async() enabled = true; unsigned int size = (XRES / CELL) * (YRES / CELL); - std::fill(&gravy[0], &gravy[size], 0); - std::fill(&gravx[0], &gravx[size], 0); - std::fill(&gravp[0], &gravp[size], 0); - std::fill(&gravmap[0], &gravmap[size], 0); + std::fill(&gravy[0], &gravy[size], 0.0f); + std::fill(&gravx[0], &gravx[size], 0.0f); + std::fill(&gravp[0], &gravp[size], 0.0f); + std::fill(&gravmap[0], &gravmap[size], 0.0f); } void Gravity::stop_grav_async() @@ -251,10 +251,10 @@ void Gravity::stop_grav_async() } // Clear the grav velocities unsigned int size = (XRES / CELL) * (YRES / CELL); - std::fill(&gravy[0], &gravy[size], 0); - std::fill(&gravx[0], &gravx[size], 0); - std::fill(&gravp[0], &gravp[size], 0); - std::fill(&gravmap[0], &gravmap[size], 0); + std::fill(&gravy[0], &gravy[size], 0.0f); + std::fill(&gravx[0], &gravx[size], 0.0f); + std::fill(&gravp[0], &gravp[size], 0.0f); + std::fill(&gravmap[0], &gravmap[size], 0.0f); } #ifdef GRAVFFT