Commit 13eb9a78 authored by incardon's avatar incardon

Fixing CUDA compilation

parent b573bb0f
...@@ -239,7 +239,7 @@ public: ...@@ -239,7 +239,7 @@ public:
typedef encapc<1,prp_object,typename dtype::memory_conf > encap_dst; typedef encapc<1,prp_object,typename dtype::memory_conf > encap_dst;
// Copy only the selected properties // Copy only the selected properties
object_si_d<encap_src,encap_dst,ENCAP,prp...>(obj.get(obj_it.get()),dest.get(obj_it.get())); object_si_d<encap_src,encap_dst,OBJ_ENCAP,prp...>(obj.get(obj_it.get()),dest.get(obj_it.get()));
++obj_it; ++obj_it;
} }
...@@ -303,7 +303,7 @@ class Packer<T,Mem,PACKER_GRID> ...@@ -303,7 +303,7 @@ class Packer<T,Mem,PACKER_GRID>
typedef encapc<1,prp_object,typename dtype::memory_conf > encap_dst; typedef encapc<1,prp_object,typename dtype::memory_conf > encap_dst;
// Copy only the selected properties // Copy only the selected properties
object_si_d<encap_src,encap_dst,ENCAP,prp...>(obj.get_o(sub_it.get()),dest.get(id)); object_si_d<encap_src,encap_dst,OBJ_ENCAP,prp...>(obj.get_o(sub_it.get()),dest.get(id));
++id; ++id;
++sub_it; ++sub_it;
......
...@@ -174,7 +174,7 @@ public: ...@@ -174,7 +174,7 @@ public:
typedef encapc<1,prp_object,typename stype::memory_conf > encap_src; typedef encapc<1,prp_object,typename stype::memory_conf > encap_src;
// Copy only the selected properties // Copy only the selected properties
object_s_di<encap_src,encap_dst,ENCAP,prp...>(src.get(id),obj.get(obj_it.get())); object_s_di<encap_src,encap_dst,OBJ_ENCAP,prp...>(src.get(id),obj.get(obj_it.get()));
++id; ++id;
++obj_it; ++obj_it;
...@@ -215,7 +215,7 @@ class Unpacker<T,Mem,PACKER_GRID> ...@@ -215,7 +215,7 @@ class Unpacker<T,Mem,PACKER_GRID>
typedef encapc<1,prp_object,typename grid_cpu<T::dims,prp_object>::memory_conf > encap_src; typedef encapc<1,prp_object,typename grid_cpu<T::dims,prp_object>::memory_conf > encap_src;
// Copy only the selected properties // Copy only the selected properties
object_s_di<encap_src,encap_dst,ENCAP,prp...>(src.get(id),obj.get_o(sub_it.get())); object_s_di<encap_src,encap_dst,OBJ_ENCAP,prp...>(src.get(id),obj.get_o(sub_it.get()));
++id; ++id;
++sub_it; ++sub_it;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment