Skip to content
Snippets Groups Projects
Commit 963a8384 authored by Pietro Incardona's avatar Pietro Incardona
Browse files

Merge remote-tracking branch 'origin/master'

parents a8b6feda e7f27463
No related branches found
No related tags found
No related merge requests found
Subproject commit e3ebd6a3ef3c0de5a11267fb03135751c1780026
Subproject commit 66ae0b6ae0ef539bab766a1c630f1f22340b6c2e
Subproject commit 895aa0e5387d7eb0f7b6be65dd18c48f7db08f64
Subproject commit 4077b1797cfd2e9f63dc5bc8b9e886fb5b51e7b7
......@@ -430,8 +430,8 @@ void remove_marked(vector_type & vd, const int n = 1024)
for (int j = 0 ; j < exp_tmp.ref() ; j++)
{exp_tmp.decRef();}*/
vd_pos_new.setMemory(exp_tmp);
vd_prp_new.setMemoryArray((CudaMemory *)&exp_tmp2);
//vd_pos_new.setMemory(exp_tmp);
//vd_prp_new.setMemoryArray((CudaMemory *)&exp_tmp2);
// resize them
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment