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

Port to Linux/g++

This commit is contained in:
Laurent Saboret 2009-04-03 17:51:59 +00:00
parent cb2644dab9
commit f6ddd6ae06
3 changed files with 60 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@ -627,7 +627,10 @@ Surface_mesher/test/Surface_mesher/my_makefile
Surface_mesher/test/Surface_mesher/test_c2t3_iterators Surface_mesher/test/Surface_mesher/test_c2t3_iterators
Surface_mesher/test/Surface_mesher/test_canonical_edge Surface_mesher/test/Surface_mesher/test_canonical_edge
Surface_mesher/test/Surface_mesher/test_robust_circumcenter Surface_mesher/test/Surface_mesher/test_robust_circumcenter
Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Point_set_demo/*.kdev*
Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Point_set_demo/*.vcproj Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Point_set_demo/*.vcproj
Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Point_set_demo/Makefile
Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Point_set_demo/Point_set_demo
Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Point_set_demo/Point_set_demo.sln Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Point_set_demo/Point_set_demo.sln
Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/poisson/*.off Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/poisson/*.off
Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/poisson/ALL_BUILD.vcproj Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/poisson/ALL_BUILD.vcproj

8
Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Point_set_demo/include/Point_set_3.h
View File

@ -55,8 +55,8 @@ public:
// Repeat base class' types // Repeat base class' types
/// @cond SKIP_IN_MANUAL /// @cond SKIP_IN_MANUAL
using Base::iterator; typedef typename Base::iterator iterator;
using Base::const_iterator; typedef typename Base::const_iterator const_iterator;
/// @endcond /// @endcond
// Classic CGAL geometric types // Classic CGAL geometric types
@ -76,8 +76,8 @@ public:
typedef typename UI_point::Normal Normal; ///< Model of OrientableNormal_3 concept. typedef typename UI_point::Normal Normal; ///< Model of OrientableNormal_3 concept.
// Iterator over Point_3 points // Iterator over Point_3 points
typedef std::deque<UI_point>::iterator Point_iterator; typedef typename std::deque<UI_point>::iterator Point_iterator;
typedef std::deque<UI_point>::const_iterator Point_const_iterator; typedef typename std::deque<UI_point>::const_iterator Point_const_iterator;
// Iterator over normals // Iterator over normals
typedef CGAL::Iterator_project<iterator, typedef CGAL::Iterator_project<iterator,

26
Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Point_set_demo/include/UI_point_3.h
View File

@ -78,32 +78,32 @@ public:
m_is_selected = false; m_is_selected = false;
} }
template <class K, class N> template <class K, class N>
UI_point_3(const Point_with_normal_3<K,N>& pwn) UI_point_3(const CGAL::Point_with_normal_3<K,N>& pwn)
: Base(pwn) : Base(pwn)
{ {
m_is_selected = false; m_is_selected = false;
} }
/// Copy constructor /// Copy constructor
UI_point_3(const UI_point_3& gpt) UI_point_3(const UI_point_3& upt)
: Base(gpt) : Base(upt)
{ {
m_is_selected = gpt.m_is_selected; m_is_selected = upt.m_is_selected;
m_original_normal = gpt.m_original_normal; m_original_normal = upt.m_original_normal;
} }
template<class K> template<class K>
UI_point_3(const UI_point_3<K>& gpt) UI_point_3(const UI_point_3<K>& upt)
: Base(gpt) : Base(upt)
{ {
m_is_selected = gpt.is_selected(); m_is_selected = upt.is_selected();
m_original_normal = gpt.m_original_normal; m_original_normal = upt.m_original_normal;
} }
/// Operator =() /// Operator =()
UI_point_3& operator=(const UI_point_3& gpt) UI_point_3& operator=(const UI_point_3& upt)
{ {
Base::operator=(gpt); Base::operator=(upt);
m_is_selected = gpt.m_is_selected; m_is_selected = upt.m_is_selected;
m_original_normal = gpt.m_original_normal; m_original_normal = upt.m_original_normal;
return *this; return *this;
} }