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

Remove warnings and errors

This commit is contained in:
Guillaume Damiand 2016-04-11 18:31:38 +02:00
parent 964a69676f
commit efdd6c5a26
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Combinatorial_map/examples/Combinatorial_map/map_3_dynamic_onmerge.cpp
View File

@ -87,8 +87,8 @@ int main()
CMap_3 cm; CMap_3 cm;
// 0) Create 2 hexahedra. // 0) Create 2 hexahedra.
Dart_handle dh1 = CGAL::make_combinatorial_hexahedron(cm); Dart_handle dh1 = cm.make_combinatorial_hexahedron();
Dart_handle dh2 = CGAL::make_combinatorial_hexahedron(cm); Dart_handle dh2 = cm.make_combinatorial_hexahedron();
// 1) Create 2-attributes of the first hexahedron, info()==7. // 1) Create 2-attributes of the first hexahedron, info()==7.
for (CMap_3::One_dart_per_incident_cell_range<2, 3>::iterator for (CMap_3::One_dart_per_incident_cell_range<2, 3>::iterator

4
Combinatorial_map/examples/Combinatorial_map/map_3_foreach.cpp
View File

@ -71,8 +71,8 @@ int main()
CMap_3 cmap; CMap_3 cmap;
// Create two tetrahedra. // Create two tetrahedra.
Dart_handle d1 = CGAL::make_combinatorial_tetrahedron(cmap); Dart_handle d1 = cmap.make_combinatorial_tetrahedron();
Dart_handle d2 = CGAL::make_combinatorial_tetrahedron(cmap); Dart_handle d2 = cmap.make_combinatorial_tetrahedron();
// Display the vertices of each volume by iterating on darts. // Display the vertices of each volume by iterating on darts.
std::cout<<"********Volumes********"<<std::endl; std::cout<<"********Volumes********"<<std::endl;

8
Combinatorial_map/include/CGAL/Combinatorial_map_operations.h
View File

@ -96,7 +96,7 @@ namespace CGAL
bool update_attributes) bool update_attributes)
{ {
CGAL_static_assertion ( 1<=i && i<CMap::dimension ); CGAL_static_assertion ( 1<=i && i<CMap::dimension );
CGAL_assertion( (amap.is_removable<i>(adart)) ); CGAL_assertion( (amap.template is_removable<i>(adart)) );
size_t res = 0; size_t res = 0;
@ -353,7 +353,7 @@ namespace CGAL
static size_t run(CMap& amap, typename CMap::Dart_handle adart, static size_t run(CMap& amap, typename CMap::Dart_handle adart,
bool update_attributes) bool update_attributes)
{ {
CGAL_assertion( (amap.is_removable<0>(adart)) ); CGAL_assertion( (amap.template is_removable<0>(adart)) );
size_t res = 0; size_t res = 0;
@ -547,7 +547,7 @@ namespace CGAL
bool update_attributes) bool update_attributes)
{ {
CGAL_static_assertion ( 2<=i && i<=CMap::dimension ); CGAL_static_assertion ( 2<=i && i<=CMap::dimension );
CGAL_assertion( (amap.is_contractible<i>(adart)) ); CGAL_assertion( (amap.template is_contractible<i>(adart)) );
size_t res = 0; size_t res = 0;
@ -703,7 +703,7 @@ namespace CGAL
static size_t run(CMap& amap, typename CMap::Dart_handle adart, static size_t run(CMap& amap, typename CMap::Dart_handle adart,
bool update_attributes) bool update_attributes)
{ {
CGAL_assertion( (amap.is_contractible<1>(adart)) ); CGAL_assertion( (amap.template is_contractible<1>(adart)) );
size_t res = 0; size_t res = 0;

6
Combinatorial_map/test/Combinatorial_map/Combinatorial_map_deprecated_test.cpp
View File

@ -22,9 +22,9 @@ bool test()
for ( int i=0; i<20; ++i ) for ( int i=0; i<20; ++i )
{ {
typename CMap::Dart_handle d1=map.darts().begin(); CMap::Dart_handle d1=map.darts().begin();
while ( !map.template is_free<3>(d1) ) ++d1; while ( !map.template is_free<3>(d1) ) ++d1;
typename CMap::Dart_handle d2=map.darts().begin(); CMap::Dart_handle d2=map.darts().begin();
while ( !map.template is_sewable<3>(d1, d2) ) ++d2; while ( !map.template is_sewable<3>(d1, d2) ) ++d2;
map.template sew<3>(d1,d2); map.template sew<3>(d1,d2);
@ -40,7 +40,7 @@ bool test()
else if (CGAL::is_contractible<CMap, 1>(map, d1)) else if (CGAL::is_contractible<CMap, 1>(map, d1))
CGAL::contract_cell<CMap, 1>(map, d1, true); CGAL::contract_cell<CMap, 1>(map, d1, true);
typename CMap::Dart_handle d3=CGAL::insert_cell_0_in_cell_1<CMap>(map, d2); CMap::Dart_handle d3=CGAL::insert_cell_0_in_cell_1<CMap>(map, d2);
CGAL::insert_cell_0_in_cell_2<CMap>(map, d2); CGAL::insert_cell_0_in_cell_2<CMap>(map, d2);
CGAL::insert_dangling_cell_1_in_cell_2<CMap>(map, d2); CGAL::insert_dangling_cell_1_in_cell_2<CMap>(map, d2);