mirror of https://github.com/CGAL/cgal
iformat/oformat are in CGAL::IO
The calls without the `IO::` namespace are deprecated.
This commit is contained in:
parent
8718201f3e
commit
1d29a75c9a
|
|
@ -736,13 +736,13 @@ public:
|
||||||
swallow(is, '(');
|
swallow(is, '(');
|
||||||
|
|
||||||
// read values
|
// read values
|
||||||
is >> iformat(rep._m_xy);
|
is >> IO::iformat(rep._m_xy);
|
||||||
swallow(is, ',');
|
swallow(is, ',');
|
||||||
is >> iformat(rep._m_x);
|
is >> IO::iformat(rep._m_x);
|
||||||
swallow(is, ',');
|
swallow(is, ',');
|
||||||
is >> iformat(rep._m_curve);
|
is >> IO::iformat(rep._m_curve);
|
||||||
swallow(is, ',');
|
swallow(is, ',');
|
||||||
is >> iformat(rep._m_arcno);
|
is >> IO::iformat(rep._m_arcno);
|
||||||
swallow(is, ',');
|
swallow(is, ',');
|
||||||
is >> rep._m_location;
|
is >> rep._m_location;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -43,7 +43,7 @@ read_triangle_poly_file(CDT& t, std::istream &f,
|
||||||
{
|
{
|
||||||
unsigned int j;
|
unsigned int j;
|
||||||
double x, y;
|
double x, y;
|
||||||
f >> j >> iformat(x) >> iformat(y);
|
f >> j >> IO::iformat(x) >> IO::iformat(y);
|
||||||
Point p(x, y);
|
Point p(x, y);
|
||||||
skip_until_EOL(f); skip_comment_OFF(f);
|
skip_until_EOL(f); skip_comment_OFF(f);
|
||||||
vertices[--j] = t.insert(p);
|
vertices[--j] = t.insert(p);
|
||||||
|
|
|
||||||
|
|
@ -1148,9 +1148,9 @@ number_of_bad_elements_impl()
|
||||||
const Subdomain mc_subdomain = this->r_oracle_.is_in_domain_object()(this->r_tr_.dual(mc));
|
const Subdomain mc_subdomain = this->r_oracle_.is_in_domain_object()(this->r_tr_.dual(mc));
|
||||||
|
|
||||||
std::cerr << "*** Is in complex? c is marked in domain: " << this->r_c3t3_.is_in_complex(c)
|
std::cerr << "*** Is in complex? c is marked in domain: " << this->r_c3t3_.is_in_complex(c)
|
||||||
<< " / c is really in subdomain: " << oformat(c_subdomain)
|
<< " / c is really in subdomain: " << IO::oformat(c_subdomain)
|
||||||
<< " / mc is marked in domain: " << this->r_c3t3_.is_in_complex(mc)
|
<< " / mc is marked in domain: " << this->r_c3t3_.is_in_complex(mc)
|
||||||
<< " / mc is really in subdomain: " << oformat(mc_subdomain)
|
<< " / mc is really in subdomain: " << IO::oformat(mc_subdomain)
|
||||||
<< std::endl;
|
<< std::endl;
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -134,15 +134,15 @@ bool read_XYZ(std::istream& is,
|
||||||
{
|
{
|
||||||
iss.clear();
|
iss.clear();
|
||||||
iss.str(line);
|
iss.str(line);
|
||||||
if (iss >> iformat(x) >> iformat(y) >> iformat(z))
|
if (iss >> IO::iformat(x) >> IO::iformat(y) >> IO::iformat(z))
|
||||||
{
|
{
|
||||||
Point point(x,y,z);
|
Point point(x,y,z);
|
||||||
Vector normal = CGAL::NULL_VECTOR;
|
Vector normal = CGAL::NULL_VECTOR;
|
||||||
// ... + normal...
|
// ... + normal...
|
||||||
if (iss >> iformat(nx))
|
if (iss >> IO::iformat(nx))
|
||||||
{
|
{
|
||||||
// In case we could read one number, we expect that there are two more
|
// In case we could read one number, we expect that there are two more
|
||||||
if(iss >> iformat(ny) >> iformat(nz)){
|
if(iss >> IO::iformat(ny) >> IO::iformat(nz)){
|
||||||
normal = Vector(nx,ny,nz);
|
normal = Vector(nx,ny,nz);
|
||||||
} else {
|
} else {
|
||||||
std::cerr << "Error line " << lineNumber << " of file (incomplete normal coordinates)" << std::endl;
|
std::cerr << "Error line " << lineNumber << " of file (incomplete normal coordinates)" << std::endl;
|
||||||
|
|
|
||||||
|
|
@ -201,7 +201,7 @@ public:
|
||||||
|
|
||||||
void read_ascii(std::istream& stream, double& t) const
|
void read_ascii(std::istream& stream, double& t) const
|
||||||
{
|
{
|
||||||
if(!(stream >> iformat(t)))
|
if(!(stream >> IO::iformat(t)))
|
||||||
stream.clear(std::ios::badbit);
|
stream.clear(std::ios::badbit);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -75,7 +75,7 @@ bool read_ASCII_facet(std::istream& is,
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
if(!(is >> iformat(x) >> iformat(y) >> iformat(z)))
|
if(!(is >> IO::iformat(x) >> IO::iformat(y) >> IO::iformat(z)))
|
||||||
{
|
{
|
||||||
if(verbose)
|
if(verbose)
|
||||||
std::cerr << "Error while reading point coordinates (premature end of file)" << std::endl;
|
std::cerr << "Error while reading point coordinates (premature end of file)" << std::endl;
|
||||||
|
|
|
||||||
|
|
@ -199,7 +199,7 @@ void write_soup_points_tag(std::ostream& os,
|
||||||
{
|
{
|
||||||
os << "\">\n";
|
os << "\">\n";
|
||||||
for(const Point& p : points)
|
for(const Point& p : points)
|
||||||
os << oformat(p.x()) << " " << oformat(p.y()) << " " << oformat(p.z()) << " ";
|
os << IO::oformat(p.x()) << " " << IO::oformat(p.y()) << " " << IO::oformat(p.z()) << " ";
|
||||||
os << " </DataArray>\n";
|
os << " </DataArray>\n";
|
||||||
}
|
}
|
||||||
os << " </Points>\n";
|
os << " </Points>\n";
|
||||||
|
|
|
||||||
|
|
@ -623,7 +623,7 @@ public:
|
||||||
auto display_vertex(Vertex_handle v) const {
|
auto display_vertex(Vertex_handle v) const {
|
||||||
With_point_tag point_tag;
|
With_point_tag point_tag;
|
||||||
using CGAL::IO::oformat;
|
using CGAL::IO::oformat;
|
||||||
return oformat(v, point_tag);
|
return IO::oformat(v, point_tag);
|
||||||
}
|
}
|
||||||
#endif // CGAL_CDT_2_DEBUG_INTERSECTIONS
|
#endif // CGAL_CDT_2_DEBUG_INTERSECTIONS
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -865,7 +865,7 @@ insert_constraint(T va, T vb){
|
||||||
using CGAL::IO::oformat;
|
using CGAL::IO::oformat;
|
||||||
std::cerr << CGAL::internal::cdt_2_indent_level
|
std::cerr << CGAL::internal::cdt_2_indent_level
|
||||||
<< "C_hierachy.insert_constraint( "
|
<< "C_hierachy.insert_constraint( "
|
||||||
<< oformat(va) << ", " << oformat(vb) << ")\n";
|
<< IO::oformat(va) << ", " << IO::oformat(vb) << ")\n";
|
||||||
#endif // CGAL_CDT_2_DEBUG_INTERSECTIONS
|
#endif // CGAL_CDT_2_DEBUG_INTERSECTIONS
|
||||||
typename Sc_to_c_map::iterator scit = sc_to_c_map.find(he);
|
typename Sc_to_c_map::iterator scit = sc_to_c_map.find(he);
|
||||||
if(scit == sc_to_c_map.end()){
|
if(scit == sc_to_c_map.end()){
|
||||||
|
|
@ -900,7 +900,7 @@ insert_constraint_old_API(T va, T vb){
|
||||||
using CGAL::IO::oformat;
|
using CGAL::IO::oformat;
|
||||||
std::cerr << CGAL::internal::cdt_2_indent_level
|
std::cerr << CGAL::internal::cdt_2_indent_level
|
||||||
<< "C_hierachy.insert_constraint_old_API( "
|
<< "C_hierachy.insert_constraint_old_API( "
|
||||||
<< oformat(va) << ", " << oformat(vb) << ")\n";
|
<< IO::oformat(va) << ", " << IO::oformat(vb) << ")\n";
|
||||||
#endif // CGAL_CDT_2_DEBUG_INTERSECTIONS
|
#endif // CGAL_CDT_2_DEBUG_INTERSECTIONS
|
||||||
typename Sc_to_c_map::iterator scit = sc_to_c_map.find(he);
|
typename Sc_to_c_map::iterator scit = sc_to_c_map.find(he);
|
||||||
if(scit == sc_to_c_map.end()){
|
if(scit == sc_to_c_map.end()){
|
||||||
|
|
@ -933,7 +933,7 @@ append_constraint(Constraint_id cid, T va, T vb){
|
||||||
using CGAL::IO::oformat;
|
using CGAL::IO::oformat;
|
||||||
std::cerr << CGAL::internal::cdt_2_indent_level
|
std::cerr << CGAL::internal::cdt_2_indent_level
|
||||||
<< "C_hierachy.append_constraint( ..., "
|
<< "C_hierachy.append_constraint( ..., "
|
||||||
<< oformat(va) << ", " << oformat(vb) << ")\n";
|
<< IO::oformat(va) << ", " << IO::oformat(vb) << ")\n";
|
||||||
#endif // CGAL_CDT_2_DEBUG_INTERSECTIONS
|
#endif // CGAL_CDT_2_DEBUG_INTERSECTIONS
|
||||||
typename Sc_to_c_map::iterator scit = sc_to_c_map.find(he);
|
typename Sc_to_c_map::iterator scit = sc_to_c_map.find(he);
|
||||||
if(scit == sc_to_c_map.end()){
|
if(scit == sc_to_c_map.end()){
|
||||||
|
|
@ -1050,7 +1050,7 @@ add_Steiner(T va, T vb, T vc){
|
||||||
using CGAL::IO::oformat;
|
using CGAL::IO::oformat;
|
||||||
std::cerr << CGAL::internal::cdt_2_indent_level
|
std::cerr << CGAL::internal::cdt_2_indent_level
|
||||||
<< "C_hierachy.add_Steinter( "
|
<< "C_hierachy.add_Steinter( "
|
||||||
<< oformat(va) << ", " << oformat(vb) << ", " << oformat(vc)
|
<< IO::oformat(va) << ", " << IO::oformat(vb) << ", " << IO::oformat(vc)
|
||||||
<< ")\n";
|
<< ")\n";
|
||||||
#endif // CGAL_CDT_2_DEBUG_INTERSECTIONS
|
#endif // CGAL_CDT_2_DEBUG_INTERSECTIONS
|
||||||
Context_list* hcl=nullptr;
|
Context_list* hcl=nullptr;
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue