Fix one error and compiler warnings with Cuda & clang-3.6

[alexxy/gromacs.git] / src / gromacs / gmxlib / cuda_tools / pmalloc_cuda.cu

diff --git a/src/gromacs/gmxlib/cuda_tools/pmalloc_cuda.cu b/src/gromacs/gmxlib/cuda_tools/pmalloc_cuda.cu
index eeef88fd41e02197b191968da5a0c7c7d422bb1b..96d21e1a139ec8a698d81e530df8ad9f13f09074 100644 (file)
--- a/src/gromacs/gmxlib/cuda_tools/pmalloc_cuda.cu
+++ b/src/gromacs/gmxlib/cuda_tools/pmalloc_cuda.cu
@@ -78,7 +78,7 @@ void pmalloc_wc(void **h_ptr, size_t nbytes)
 {
     cudaError_t stat;
     char        strbuf[STRLEN];
-    int         flag = cudaHostAllocDefault || cudaHostAllocWriteCombined;
+    int         flag = cudaHostAllocDefault | cudaHostAllocWriteCombined;
 
     if (nbytes == 0)
     {