Merge pull request #34 from itischler/4.0.2

fixed compile errors
espressomd · Apr 11, 2019 · a3d4fc5 · a3d4fc5
2 parents 84952c3 + 4047f5f
commit a3d4fc5
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/core/electrokinetics_cuda.cu b/src/core/electrokinetics_cuda.cu
@@ -3728,7 +3728,7 @@ int ek_set_ext_force_density(int species, double ext_force_density_x,
 
 #ifdef EK_ELECTROSTATIC_COUPLING
 struct ek_charge_of_particle {
-  __device__ ekfloat operator()(CUDA_particle_data particle) {
+  __host__ __device__ ekfloat operator()(CUDA_particle_data particle) {
     return particle.q;
   };
 };

diff --git a/src/core/lbgpu_cuda.cu b/src/core/lbgpu_cuda.cu
@@ -4476,7 +4476,7 @@ void lb_gpu_get_boundary_forces(double *forces) {
 }
 
 struct lb_lbfluid_mass_of_particle {
-  __device__ float operator()(CUDA_particle_data particle) const {
+  __host__ __device__ float operator()(CUDA_particle_data particle) const {
 #ifdef MASS
     return particle.mass;
 #else