mirror of https://github.com/CGAL/cgal
remove condition for cpp11 to be present in face graph related packages
This commit is contained in:
parent
2ce16d14b5
commit
e6cdf9f62b
|
|
@ -47,9 +47,7 @@ public:
|
|||
HalfedgeDS_in_place_list_vertex( const VertexBase& v) // down cast
|
||||
: VertexBase(v) {}
|
||||
|
||||
#ifndef CGAL_CFG_NO_CPP0X_DELETED_AND_DEFAULT_FUNCTIONS
|
||||
HalfedgeDS_in_place_list_vertex(const HalfedgeDS_in_place_list_vertex&)=default;
|
||||
#endif
|
||||
HalfedgeDS_in_place_list_vertex(const HalfedgeDS_in_place_list_vertex&)=default;
|
||||
|
||||
Self& operator=( const Self& v) {
|
||||
// This self written assignment avoids that assigning vertices will
|
||||
|
|
@ -72,9 +70,7 @@ public:
|
|||
HalfedgeDS_in_place_list_halfedge( const HalfedgeBase& h)
|
||||
: HalfedgeBase(h) {}
|
||||
|
||||
#ifndef CGAL_CFG_NO_CPP0X_DELETED_AND_DEFAULT_FUNCTIONS
|
||||
HalfedgeDS_in_place_list_halfedge(const HalfedgeDS_in_place_list_halfedge&)=default;
|
||||
#endif
|
||||
HalfedgeDS_in_place_list_halfedge(const HalfedgeDS_in_place_list_halfedge&)=default;
|
||||
|
||||
Self& operator=( const Self& h) {
|
||||
// This self written assignment avoids that assigning halfedges will
|
||||
|
|
@ -95,9 +91,7 @@ public:
|
|||
HalfedgeDS_in_place_list_face() {} // down cast
|
||||
HalfedgeDS_in_place_list_face( const FaceBase& f) : FaceBase(f) {}
|
||||
|
||||
#ifndef CGAL_CFG_NO_CPP0X_DELETED_AND_DEFAULT_FUNCTIONS
|
||||
HalfedgeDS_in_place_list_face(const HalfedgeDS_in_place_list_face&)=default;
|
||||
#endif
|
||||
HalfedgeDS_in_place_list_face(const HalfedgeDS_in_place_list_face&)=default;
|
||||
|
||||
Self& operator=( const Self& f) {
|
||||
// This self written assignment avoids that assigning faces will
|
||||
|
|
|
|||
|
|
@ -570,7 +570,6 @@ void Scene_points_with_normal_item::selectDuplicates()
|
|||
Q_EMIT itemChanged();
|
||||
}
|
||||
|
||||
#if !defined(CGAL_CFG_NO_CPP0X_RVALUE_REFERENCE) && !defined(CGAL_CFG_NO_CPP0X_VARIADIC_TEMPLATES)
|
||||
#ifdef CGAL_LINKED_WITH_LASLIB
|
||||
// Loads point set from .LAS file
|
||||
bool Scene_points_with_normal_item::read_las_point_set(std::istream& stream)
|
||||
|
|
@ -659,8 +658,6 @@ bool Scene_points_with_normal_item::write_ply_point_set(std::ostream& stream, bo
|
|||
return true;
|
||||
}
|
||||
|
||||
#endif // CXX11
|
||||
|
||||
// Loads point set from .OFF file
|
||||
bool Scene_points_with_normal_item::read_off_point_set(std::istream& stream)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -44,14 +44,12 @@ public:
|
|||
QMenu* contextMenu() Q_DECL_OVERRIDE;
|
||||
|
||||
// IO
|
||||
#if !defined(CGAL_CFG_NO_CPP0X_RVALUE_REFERENCE) && !defined(CGAL_CFG_NO_CPP0X_VARIADIC_TEMPLATES)
|
||||
#ifdef CGAL_LINKED_WITH_LASLIB
|
||||
bool read_las_point_set(std::istream& in);
|
||||
bool write_las_point_set(std::ostream& out) const;
|
||||
#endif // LAS
|
||||
bool read_ply_point_set(std::istream& in);
|
||||
bool write_ply_point_set(std::ostream& out, bool binary) const;
|
||||
#endif // CXX11
|
||||
bool read_off_point_set(std::istream& in);
|
||||
bool write_off_point_set(std::ostream& out) const;
|
||||
bool read_xyz_point_set(std::istream& in);
|
||||
|
|
|
|||
|
|
@ -57,11 +57,9 @@ int main()
|
|||
}
|
||||
|
||||
// or the C++11 for loop. Note that there is a ':' and not a ',' as in BOOST_FOREACH
|
||||
#ifndef CGAL_CFG_NO_CPP0X_RANGE_BASED_FOR
|
||||
for(vertex_descriptor vd : m.vertices()){
|
||||
std::cout << vd << std::endl;
|
||||
}
|
||||
#endif
|
||||
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -356,14 +356,8 @@ private:
|
|||
std::vector<double> scales;
|
||||
#endif
|
||||
|
||||
#ifndef CGAL_CFG_NO_CPP0X_DELETED_AND_DEFAULT_FUNCTIONS
|
||||
public:
|
||||
Surface_mesh_deformation(const Self&) = delete; // no copy
|
||||
#else
|
||||
private:
|
||||
Surface_mesh_deformation(const Self&); // no copy
|
||||
#endif
|
||||
|
||||
|
||||
// Public methods
|
||||
public:
|
||||
|
|
|
|||
Loading…
Reference in New Issue