Browse Source

Fix warnings and errors on gcc.

Dhairya Malhotra 10 years ago
parent
commit
8143a35d91
3 changed files with 9 additions and 9 deletions
  1. 4 4
      include/device_wrapper.txx
  2. 4 4
      include/fmm_cheb.txx
  3. 1 1
      include/mem_mgr.txx

+ 4 - 4
include/device_wrapper.txx

@@ -170,7 +170,7 @@ extern "C" {
   // Wrapper functions
 
   inline void* host_malloc(size_t size){
-    #ifdef defined(PVFMM_HAVE_CUDA)
+    #if defined(PVFMM_HAVE_CUDA)
     return host_malloc_cuda;
     #else
     return malloc(size);
@@ -178,7 +178,7 @@ extern "C" {
   }
 
   inline void host_free(void* p){
-    #ifdef defined(PVFMM_HAVE_CUDA)
+    #if defined(PVFMM_HAVE_CUDA)
     return host_free_cuda(p);
     #else
     return free(p);
@@ -207,7 +207,7 @@ extern "C" {
     #endif
   }
 
-  template <int SYNC=__DEVICE_SYNC__>
+  template <int SYNC>
   inline int host2device(char* host_ptr, char* dev_handle, uintptr_t dev_ptr, size_t len){
     int lock_idx=-1;
     #ifdef __INTEL_OFFLOAD
@@ -224,7 +224,7 @@ extern "C" {
     return lock_idx;
   }
 
-  template <int SYNC=__DEVICE_SYNC__>
+  template <int SYNC>
   inline int device2host(char* dev_handle, uintptr_t dev_ptr, char* host_ptr, size_t len){
     int lock_idx=-1;
     #ifdef __INTEL_OFFLOAD

+ 4 - 4
include/fmm_cheb.txx

@@ -244,7 +244,7 @@ Permutation<Real_t> cheb_perm(size_t q, size_t p_indx, const Permutation<Real_t>
   if(p_indx==ReflecX || p_indx==ReflecY || p_indx==ReflecZ){
     for(int j=0;j<dof;j++)
     for(int i=0;i<n3;i++){
-      int x[3]={i%(q+1), (i/(q+1))%(q+1), i/(q+1)/(q+1)};
+      size_t x[3]={i%(q+1), (i/(q+1))%(q+1), i/(q+1)/(q+1)};
       P0.scal[i+n3*j]*=(x[p_indx-ReflecX]%2?-1.0:1.0);
     }
   }
@@ -255,7 +255,7 @@ Permutation<Real_t> cheb_perm(size_t q, size_t p_indx, const Permutation<Real_t>
     if(p_indx==SwapXZ) {indx[0]=2; indx[1]=1; indx[2]=0;}
     for(int j=0;j<dof;j++)
     for(int i=0;i<n3;i++){
-      int x[3]={i%(q+1), (i/(q+1))%(q+1), i/(q+1)/(q+1)};
+      size_t x[3]={i%(q+1), (i/(q+1))%(q+1), i/(q+1)/(q+1)};
       P0.perm[i+n3*j]=x[indx[0]]+(x[indx[1]]+x[indx[2]]*(q+1))*(q+1)
                       +n3*ker_perm.perm[j];
     }
@@ -266,7 +266,7 @@ Permutation<Real_t> cheb_perm(size_t q, size_t p_indx, const Permutation<Real_t>
     int indx=0;
     for(int j=0;j<dof;j++)
     for(int i=0;i<n3;i++){
-      int x[3]={i%(q+1), (i/(q+1))%(q+1), i/(q+1)/(q+1)};
+      size_t x[3]={i%(q+1), (i/(q+1))%(q+1), i/(q+1)/(q+1)};
       if(x[0]+x[1]+x[2]<=q){
         coeff_map[i+n3*j]=indx;
         indx++;
@@ -278,7 +278,7 @@ Permutation<Real_t> cheb_perm(size_t q, size_t p_indx, const Permutation<Real_t>
     int indx=0;
     for(int j=0;j<dof;j++)
     for(int i=0;i<n3;i++){
-      int x[3]={i%(q+1), (i/(q+1))%(q+1), i/(q+1)/(q+1)};
+      size_t x[3]={i%(q+1), (i/(q+1))%(q+1), i/(q+1)/(q+1)};
       if(x[0]+x[1]+x[2]<=q){
         P.perm[indx]=coeff_map[P0.perm[i+n3*j]];
         P.scal[indx]=          P0.scal[i+n3*j] ;

+ 1 - 1
include/mem_mgr.txx

@@ -25,7 +25,7 @@ bool TypeTraits<T>::IsPOD(){
   return false;
 }
 
-#define PVFMMDefinePOD(type) template<> bool TypeTraits<type>::IsPOD(){return true;};
+#define PVFMMDefinePOD(type) template<> bool inline TypeTraits<type>::IsPOD(){return true;};
 PVFMMDefinePOD(char);
 PVFMMDefinePOD(float);
 PVFMMDefinePOD(double);