mirror of
https://github.com/NGSolve/netgen.git
synced 2024-12-25 21:40:33 +05:00
move DoArchive to cpp-file
This commit is contained in:
parent
8522cfdac5
commit
5a320121fd
@ -67,11 +67,13 @@ namespace ngstd
|
||||
std::map<void*,int> ptr2nr;
|
||||
std::vector<void*> nr2ptr;
|
||||
|
||||
/*
|
||||
// necessary for msvc ???
|
||||
Archive & operator& (string* & ps)
|
||||
{
|
||||
return operator&<string> (ps);
|
||||
}
|
||||
*/
|
||||
|
||||
template <typename T>
|
||||
Archive & operator& (T *& p)
|
||||
|
@ -148,6 +148,15 @@ namespace netgen
|
||||
return *this;
|
||||
}
|
||||
|
||||
ngstd::Archive & Segment :: DoArchive (ngstd::Archive & ar)
|
||||
{
|
||||
return ar & pnums[0] & pnums[1] & pnums[2]
|
||||
& edgenr & singedge_left & singedge_right
|
||||
& si & cd2i & domin & domout & tlosurf
|
||||
& surfnr1 & surfnr2
|
||||
& bcname;
|
||||
}
|
||||
|
||||
|
||||
ostream & operator<<(ostream & s, const Segment & seg)
|
||||
{
|
||||
@ -2417,6 +2426,17 @@ namespace netgen
|
||||
bcn = &default_bcname;
|
||||
}
|
||||
|
||||
ngstd::Archive & FaceDescriptor :: DoArchive (ngstd::Archive & ar)
|
||||
{
|
||||
return ar & surfnr & domin & domout & tlosurf & bcprop
|
||||
& surfcolour.X() & surfcolour.Y() & surfcolour.Z()
|
||||
& bcname
|
||||
& domin_singular & domout_singular ;
|
||||
// don't need: firstelement
|
||||
}
|
||||
|
||||
|
||||
|
||||
ostream & operator<<(ostream & s, const FaceDescriptor & fd)
|
||||
{
|
||||
s << "surfnr = " << fd.SurfNr()
|
||||
|
@ -1049,15 +1049,7 @@ namespace netgen
|
||||
#else
|
||||
int GetPartition () const { return 0; }
|
||||
#endif
|
||||
ngstd::Archive & DoArchive (ngstd::Archive & ar)
|
||||
{
|
||||
return ar & pnums[0] & pnums[1] & pnums[2]
|
||||
& edgenr & singedge_left & singedge_right
|
||||
& si & cd2i & domin & domout & tlosurf
|
||||
& surfnr1 & surfnr2
|
||||
& bcname;
|
||||
}
|
||||
|
||||
ngstd::Archive & DoArchive (ngstd::Archive & ar);
|
||||
};
|
||||
|
||||
inline ngstd::Archive & operator & (ngstd::Archive & archive, Segment & mp)
|
||||
@ -1150,15 +1142,7 @@ namespace netgen
|
||||
// friend ostream & operator<<(ostream & s, const FaceDescriptor & fd);
|
||||
friend class Mesh;
|
||||
|
||||
ngstd::Archive & DoArchive (ngstd::Archive & ar)
|
||||
{
|
||||
return ar & surfnr & domin & domout & tlosurf & bcprop
|
||||
& surfcolour.X() & surfcolour.Y() & surfcolour.Z()
|
||||
& bcname
|
||||
& domin_singular & domout_singular ;
|
||||
// don't need: firstelement
|
||||
}
|
||||
|
||||
ngstd::Archive & DoArchive (ngstd::Archive & ar);
|
||||
};
|
||||
|
||||
inline ngstd::Archive & operator & (ngstd::Archive & archive, FaceDescriptor & mp)
|
||||
|
Loading…
Reference in New Issue
Block a user