songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

You guessed right : Move Tetrahedron_3 I/O to user class level

This commit is contained in:
Sylvain Pion 2006-08-06 15:59:24 +00:00
parent 02414e55f0
commit 812a7c8cbd
2 changed files with 25 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
Cartesian_kernel/include/CGAL/Cartesian/Tetrahedron_3.h
View File

@ -229,39 +229,6 @@ TetrahedronC3<R>::bbox() const
+ construct_bbox_3(vertex(2)) + construct_bbox_3(vertex(3));
}
#ifndef CGAL_NO_OSTREAM_INSERT_TETRAHEDRONC3
template < class R >
std::ostream &
operator<<(std::ostream &os, const TetrahedronC3<R> &t)
{
switch(os.iword(IO::mode)) {
case IO::ASCII :
return os << t[0] << ' ' << t[1] << ' ' << t[2] << ' ' << t[3];
case IO::BINARY :
return os << t[0] << t[1] << t[2] << t[3];
default:
os << "TetrahedronC3(" << t[0] << ", " << t[1] << ", " << t[2];
os << ", " << t[3] << ")";
return os;
}
}
#endif // CGAL_NO_OSTREAM_INSERT_TETRAHEDRONC3
#ifndef CGAL_NO_ISTREAM_EXTRACT_TETRAHEDRONC3
template < class R >
std::istream &
operator>>(std::istream &is, TetrahedronC3<R> &t)
{
typename R::Point_3 p, q, r, s;
is >> p >> q >> r >> s;
if (is)
t = TetrahedronC3<R>(p, q, r, s);
return is;
}
#endif // CGAL_NO_ISTREAM_EXTRACT_TETRAHEDRONC3
CGAL_END_NAMESPACE
#endif // CGAL_CARTESIAN_TETRAHEDRON_3_H

40
Kernel_23/include/CGAL/Tetrahedron_3.h
View File

@ -133,25 +133,35 @@ public:
};
#ifndef CGAL_NO_OSTREAM_INSERT_TETRAHEDRON_3
template < class R >
std::ostream&
operator<<(std::ostream& os, const Tetrahedron_3<R>& t)
{
typedef typename R::Kernel_base::Tetrahedron_3 Rep;
return os << static_cast<const Rep&>(t);
}
#endif // CGAL_NO_OSTREAM_INSERT_TETRAHEDRON_3
#ifndef CGAL_NO_ISTREAM_EXTRACT_TETRAHEDRON_3
template < class R >
std::istream&
operator>>(std::istream& is, Tetrahedron_3<R>& t)
std::ostream &
operator<<(std::ostream &os, const Tetrahedron_3<R> &t)
{
typedef typename R::Kernel_base::Tetrahedron_3 Rep;
return is >> static_cast<Rep&>(t);
switch(os.iword(IO::mode)) {
case IO::ASCII :
return os << t[0] << ' ' << t[1] << ' ' << t[2] << ' ' << t[3];
case IO::BINARY :
return os << t[0] << t[1] << t[2] << t[3];
default:
os << "Tetrahedron_3(" << t[0] << ", " << t[1] << ", " << t[2];
os << ", " << t[3] << ")";
return os;
}
}
template < class R >
std::istream &
operator>>(std::istream &is, Tetrahedron_3<R> &t)
{
typename R::Point_3 p, q, r, s;
is >> p >> q >> r >> s;
if (is)
t = Tetrahedron_3<R>(p, q, r, s);
return is;
}
#endif // CGAL_NO_ISTREAM_EXTRACT_TETRAHEDRON_3
CGAL_END_NAMESPACE