nojhan/paradiseo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@2105 331e1502-861f-0410-8da2-ba01fb791d7f

Browse source
This commit is contained in:
boufaras 2011-02-07 10:16:16 +00:00
commit bd3435afcb
1 changed files with 2 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

17
ParadisEO-GPU/src/cudaType/moCudaVector.h
View file

@ -48,8 +48,8 @@ class moCudaVector: public EO<Fitness> {
public: public:
typedef ElemT ElemType; typedef ElemT ElemType;
using moCudaVector<int, Fitness>::vect; ElemType * vect;
using moCudaVector<int, Fitness>::N; unsigned N;
/** /**
* Default constructor. * Default constructor.
@ -144,18 +144,6 @@ public:
} }
<<<<<<< .mine
virtual void printOn(std::ostream& os) const {
EO<Fitness>::printOn(os);
os << ' ';
os << N << ' ';
unsigned int i;
for( i=0;i<N;i++)
os<< vect[i] << ' ';
}
=======
virtual void printOn(std::ostream& os) const { virtual void printOn(std::ostream& os) const {
EO<Fitness>::printOn(os); EO<Fitness>::printOn(os);
os << ' '; os << ' ';
@ -166,7 +154,6 @@ public:
} }
>>>>>>> .r2101
}; };
#endif #endif