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

Triangulation

This commit is contained in:
Andreas Fabri 2018-01-18 13:56:10 +00:00
parent f972c6da7a
commit 257b180351
12 changed files with 44 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Installation/include/CGAL/disable_warnings.h
View File

@ -30,6 +30,7 @@
# pragma warning(disable: 4512) // assignment operator could not be generated# pragma warning(disable: 4522) // multiple assignment operators specified # pragma warning(disable: 4512) // assignment operator could not be generated# pragma warning(disable: 4522) // multiple assignment operators specified
# pragma warning(disable: 4610) // can never be instantiated - user defined constructor required # pragma warning(disable: 4610) // can never be instantiated - user defined constructor required
# pragma warning(disable: 4706) // assignment within conditional expression # pragma warning(disable: 4706) // assignment within conditional expression
# pragma warning(disable: 4714) // function marked as __forceinline not inlined
# pragma warning(disable: 4800) // forcing value to bool 'true' or 'false' (performance warning) # pragma warning(disable: 4800) // forcing value to bool 'true' or 'false' (performance warning)
# pragma warning(disable: 4913) // user defined binary operator ',' exists but no overload could convert all operands, default built-in binary operator ',' used # pragma warning(disable: 4913) // user defined binary operator ',' exists but no overload could convert all operands, default built-in binary operator ',' used

6
NewKernel_d/include/CGAL/Epeck_d.h
View File

@ -20,6 +20,9 @@
#ifndef CGAL_EPECK_D_H #ifndef CGAL_EPECK_D_H
#define CGAL_EPECK_D_H #define CGAL_EPECK_D_H
#include <CGAL/disable_warnings.h>
#include <CGAL/NewKernel_d/Cartesian_base.h> #include <CGAL/NewKernel_d/Cartesian_base.h>
#include <CGAL/NewKernel_d/Wrapper/Cartesian_wrap.h> #include <CGAL/NewKernel_d/Wrapper/Cartesian_wrap.h>
#include <CGAL/NewKernel_d/Kernel_d_interface.h> #include <CGAL/NewKernel_d/Kernel_d_interface.h>
@ -51,4 +54,7 @@ struct Epeck_d
}; };
#undef CGAL_BASE #undef CGAL_BASE
} }
#include <CGAL/enable_warnings.h>
#endif #endif

6
NewKernel_d/include/CGAL/Epick_d.h
View File

@ -20,6 +20,9 @@
#ifndef CGAL_EPICK_D_H #ifndef CGAL_EPICK_D_H
#define CGAL_EPICK_D_H #define CGAL_EPICK_D_H
#include <CGAL/disable_warnings.h>
#include <CGAL/NewKernel_d/Cartesian_base.h> #include <CGAL/NewKernel_d/Cartesian_base.h>
#include <CGAL/NewKernel_d/Cartesian_static_filters.h> #include <CGAL/NewKernel_d/Cartesian_static_filters.h>
#include <CGAL/NewKernel_d/Cartesian_filter_K.h> #include <CGAL/NewKernel_d/Cartesian_filter_K.h>
@ -69,4 +72,7 @@ struct Epick_d
}; };
#undef CGAL_BASE #undef CGAL_BASE
} }
#include <CGAL/enable_warnings.h>
#endif #endif

6
NewKernel_d/test/NewKernel_d/Epick_d.cpp
View File

@ -12,6 +12,7 @@ int main()
//#define BOOST_RESULT_OF_USE_DECLTYPE 1 //#define BOOST_RESULT_OF_USE_DECLTYPE 1
#include <CGAL/Epick_d.h> #include <CGAL/Epick_d.h>
#include <typeinfo> #include <typeinfo>
#include <CGAL/NewKernel_d/Cartesian_base.h> #include <CGAL/NewKernel_d/Cartesian_base.h>
#include <CGAL/NewKernel_d/Cartesian_static_filters.h> #include <CGAL/NewKernel_d/Cartesian_static_filters.h>
#include <CGAL/NewKernel_d/Cartesian_filter_NT.h> #include <CGAL/NewKernel_d/Cartesian_filter_NT.h>
@ -25,6 +26,7 @@ int main()
#include <iostream> #include <iostream>
#include <sstream> #include <sstream>
#include <CGAL/NewKernel_d/Types/Weighted_point.h> #include <CGAL/NewKernel_d/Types/Weighted_point.h>
#include <cmath> #include <cmath>
//typedef CGAL::Cartesian_base_d<double,CGAL::Dimension_tag<2> > K0; //typedef CGAL::Cartesian_base_d<double,CGAL::Dimension_tag<2> > K0;
@ -411,6 +413,8 @@ void test2(){
D un10; CGAL_USE(un10); D un10; CGAL_USE(un10);
} }
# pragma warning(push)
# pragma warning(disable: 4512)
template<class CP> struct Construct_point3_helper { template<class CP> struct Construct_point3_helper {
CP const& cp; CP const& cp;
Construct_point3_helper(CP const& x) : cp(x) {} Construct_point3_helper(CP const& x) : cp(x) {}
@ -426,6 +430,8 @@ template<class CP> struct Construct_point3_helper {
} }
}; };
# pragma warning(pop)
template<class Ker> template<class Ker>
void test3(){ void test3(){
typedef Ker K1; typedef Ker K1;

4
Triangulation/include/CGAL/Regular_triangulation.h
View File

@ -23,6 +23,8 @@
#include <CGAL/license/Triangulation.h> #include <CGAL/license/Triangulation.h>
#include <CGAL/disable_warnings.h>
#include <CGAL/Triangulation.h> #include <CGAL/Triangulation.h>
#include <CGAL/Dimension.h> #include <CGAL/Dimension.h>
#include <CGAL/Default.h> #include <CGAL/Default.h>
@ -1166,4 +1168,6 @@ Regular_triangulation<Traits, TDS>
} //namespace CGAL } //namespace CGAL
#include <CGAL/enable_warnings.h>
#endif //CGAL_REGULAR_TRIANGULATION_H #endif //CGAL_REGULAR_TRIANGULATION_H

3
Triangulation/include/CGAL/Triangulation_data_structure.h
View File

@ -23,6 +23,7 @@
#include <CGAL/license/Triangulation.h> #include <CGAL/license/Triangulation.h>
#include <CGAL/disable_warnings.h>
#include <CGAL/basic.h> #include <CGAL/basic.h>
#include <CGAL/Default.h> #include <CGAL/Default.h>
@ -1604,4 +1605,6 @@ operator<<(std::ostream & os, const Triangulation_data_structure<Dimen, Vb, Fcb>
} //namespace CGAL } //namespace CGAL
#include <CGAL/enable_warnings.h>
#endif // CGAL_TRIANGULATION_DATA_STRUCTURE_H #endif // CGAL_TRIANGULATION_DATA_STRUCTURE_H

3
Triangulation/include/CGAL/Triangulation_ds_full_cell.h
View File

@ -23,6 +23,7 @@
#include <CGAL/license/Triangulation.h> #include <CGAL/license/Triangulation.h>
#include <CGAL/disable_warnings.h>
#include <CGAL/TDS_full_cell_default_storage_policy.h> #include <CGAL/TDS_full_cell_default_storage_policy.h>
#include <CGAL/TDS_full_cell_mirror_storage_policy.h> #include <CGAL/TDS_full_cell_mirror_storage_policy.h>
@ -312,4 +313,6 @@ public:
} //namespace CGAL } //namespace CGAL
#include <CGAL/enable_warnings.h>
#endif // CGAL_TRIANGULATION_DS_FULL_CELL_H #endif // CGAL_TRIANGULATION_DS_FULL_CELL_H

3
Triangulation/include/CGAL/Triangulation_ds_vertex.h
View File

@ -23,6 +23,7 @@
#include <CGAL/license/Triangulation.h> #include <CGAL/license/Triangulation.h>
#include <CGAL/disable_warnings.h>
#include <CGAL/Compact_container.h> #include <CGAL/Compact_container.h>
#include <CGAL/internal/Triangulation/Dummy_TDS.h> #include <CGAL/internal/Triangulation/Dummy_TDS.h>
@ -155,4 +156,6 @@ public:
} //namespace CGAL } //namespace CGAL
#include <CGAL/enable_warnings.h>
#endif // CGAL_TRIANGULATION_DS_VERTEX_H #endif // CGAL_TRIANGULATION_DS_VERTEX_H

3
Triangulation/include/CGAL/Triangulation_face.h
View File

@ -23,6 +23,7 @@
#include <CGAL/license/Triangulation.h> #include <CGAL/license/Triangulation.h>
#include <CGAL/disable_warnings.h>
#include <CGAL/basic.h> #include <CGAL/basic.h>
#include <CGAL/internal/Static_or_dynamic_array.h> #include <CGAL/internal/Static_or_dynamic_array.h>
@ -112,4 +113,6 @@ public:
} //namespace CGAL } //namespace CGAL
#include <CGAL/enable_warnings.h>
#endif // CGAL_TRIANGULATION_FACE_H #endif // CGAL_TRIANGULATION_FACE_H

3
Triangulation/include/CGAL/Triangulation_full_cell.h
View File

@ -23,6 +23,7 @@
#include <CGAL/license/Triangulation.h> #include <CGAL/license/Triangulation.h>
#include <CGAL/disable_warnings.h>
#include <CGAL/Triangulation_ds_full_cell.h> #include <CGAL/Triangulation_ds_full_cell.h>
#include <CGAL/internal/Triangulation/utilities.h> #include <CGAL/internal/Triangulation/utilities.h>
@ -149,4 +150,6 @@ operator>>(std::istream & I, Triangulation_full_cell<TDS, Data, SSP> & s)
} //namespace CGAL } //namespace CGAL
#include <CGAL/enable_warnings.h>
#endif // CGAL_TRIANGULATION_SIMPLEX_H #endif // CGAL_TRIANGULATION_SIMPLEX_H

3
Triangulation/include/CGAL/Triangulation_vertex.h
View File

@ -23,6 +23,7 @@
#include <CGAL/license/Triangulation.h> #include <CGAL/license/Triangulation.h>
#include <CGAL/disable_warnings.h>
#include <CGAL/Triangulation_ds_vertex.h> #include <CGAL/Triangulation_ds_vertex.h>
#include <CGAL/Default.h> #include <CGAL/Default.h>
@ -129,4 +130,6 @@ operator<<(std::ostream & os, const Triangulation_vertex<A, Data, B> & v)
} //namespace CGAL } //namespace CGAL
#include <CGAL/enable_warnings.h>
#endif // CGAL_TRIANGULATION_VERTEX_H #endif // CGAL_TRIANGULATION_VERTEX_H

3
Triangulation/include/CGAL/internal/Combination_enumerator.h
View File

@ -23,6 +23,7 @@
#include <CGAL/license/Triangulation.h> #include <CGAL/license/Triangulation.h>
#include <CGAL/disable_warnings.h>
#include <CGAL/basic.h> #include <CGAL/basic.h>
#include <vector> #include <vector>
@ -149,4 +150,6 @@ public:
} // end of namespace CGAL } // end of namespace CGAL
#include <CGAL/enable_warnings.h>
#endif // CGAL_INTERNAL_COMBINATION_ENUMERATOR_H #endif // CGAL_INTERNAL_COMBINATION_ENUMERATOR_H