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

VC mixes up the local Ambient_dimension and CGAL::Ambient_dimension

This commit is contained in:
Andreas Fabri 2010-01-20 15:12:13 +00:00
parent 5e4c755bdb
commit cda55de625
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Triangulation_2/include/CGAL/Triangulation_data_structure_2.h
View File

@ -315,7 +315,7 @@ public:
bool is_valid(bool verbose = false, int level = 0) const; bool is_valid(bool verbose = false, int level = 0) const;
// HELPING // HELPING
private: //AF: private:
typedef std::pair<Vertex_handle,Vertex_handle> Vh_pair; typedef std::pair<Vertex_handle,Vertex_handle> Vh_pair;
void set_adjacency(Face_handle fh, void set_adjacency(Face_handle fh,
int ih, int ih,
@ -2154,12 +2154,12 @@ reorient_faces()
int nf = std::distance(faces_begin(),faces_end()); int nf = std::distance(faces_begin(),faces_end());
while (static_cast<int>(oriented_set.size()) != nf) { while (static_cast<int>(oriented_set.size()) != nf) {
while ( oriented_set.find(fit->handle()) != oriented_set.end()){ while ( oriented_set.find(fit) != oriented_set.end()){
++fit; // find a germ for non oriented components ++fit; // find a germ for non oriented components
} }
// orient component // orient component
oriented_set.insert(fit->handle()); oriented_set.insert(fit);
st.push(fit->handle()); st.push(fit);
while ( ! st.empty()) { while ( ! st.empty()) {
Face_handle fh = st.top(); Face_handle fh = st.top();
st.pop(); st.pop();

4
Triangulation_2/include/CGAL/Weighted_point.h
View File

@ -66,7 +66,7 @@ public:
Weighted_point (const Tx &x, const Ty &y, Weighted_point (const Tx &x, const Ty &y,
typename boost::enable_if< boost::mpl::and_<boost::is_convertible<Tx, FT>, typename boost::enable_if< boost::mpl::and_<boost::is_convertible<Tx, FT>,
boost::is_convertible<Ty, FT>, boost::is_convertible<Ty, FT>,
boost::mpl::bool_<Ambient_dimension<Point>::value == 2> > >::type* = 0) boost::mpl::bool_<CGAL::Ambient_dimension<Point>::value == 2> > >::type* = 0)
: Point(x, y), _weight(0) {} : Point(x, y), _weight(0) {}
template < typename Tx, typename Ty, typename Tz > template < typename Tx, typename Ty, typename Tz >
@ -74,7 +74,7 @@ public:
typename boost::enable_if< boost::mpl::and_<boost::is_convertible<Tx, FT>, typename boost::enable_if< boost::mpl::and_<boost::is_convertible<Tx, FT>,
boost::is_convertible<Ty, FT>, boost::is_convertible<Ty, FT>,
boost::is_convertible<Tz, FT>, boost::is_convertible<Tz, FT>,
boost::mpl::bool_<Ambient_dimension<Point>::value == 3> > >::type* = 0) boost::mpl::bool_<CGAL::Ambient_dimension<Point>::value == 3> > >::type* = 0)
: Point(x, y, z), _weight(0) {} : Point(x, y, z), _weight(0) {}
const Point & point() const const Point & point() const