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

Remove warnings in CMap

This commit is contained in:
Guillaume Damiand 2013-03-11 12:43:31 +01:00
parent 8a76ac5cf9
commit 0fb7b0d390
6 changed files with 4 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Combinatorial_map/examples/Combinatorial_map/map_3_with_colored_facets.cpp
View File

@ -12,11 +12,10 @@ struct Sum_functor
void operator()(Cell_attribute& ca1,Cell_attribute& ca2) void operator()(Cell_attribute& ca1,Cell_attribute& ca2)
{ ca1.info()=ca1.info()+ca2.info(); } { ca1.info()=ca1.info()+ca2.info(); }
}; };
template<typename CMap>
struct Divide_by_two_functor struct Divide_by_two_functor
{ {
template<class Cell_attribute> template<class Cell_attribute>
void operator()(CMap* amap, Cell_attribute& ca1,Cell_attribute& ca2) void operator()(Cell_attribute& ca1,Cell_attribute& ca2)
{ {
ca1.info()=(ca1.info()/2); ca1.info()=(ca1.info()/2);
ca2.info()=(ca1.info()); ca2.info()=(ca1.info());
@ -30,8 +29,7 @@ struct Myitem
{ {
typedef CGAL::Dart<3, CMap> Dart; typedef CGAL::Dart<3, CMap> Dart;
typedef CGAL::Cell_attribute<CMap, int, CGAL::Tag_true, typedef CGAL::Cell_attribute<CMap, int, CGAL::Tag_true,
Sum_functor, Divide_by_two_functor<CMap> > Sum_functor, Divide_by_two_functor> Facet_attribute;
Facet_attribute;
typedef CGAL::cpp11::tuple<void,void,Facet_attribute> Attributes; typedef CGAL::cpp11::tuple<void,void,Facet_attribute> Attributes;
}; };
}; };

5
Combinatorial_map/include/CGAL/Combinatorial_map.h
View File

@ -38,11 +38,6 @@
#include <CGAL/config.h> #include <CGAL/config.h>
// suppress bogus warning when compiling with gcc>=4.3
#if CGAL_GCC_VERSION >= 40300
#pragma GCC diagnostic ignored "-Warray-bounds"
#endif
namespace CGAL { namespace CGAL {
/** @file Combinatorial_map.h /** @file Combinatorial_map.h

2
Combinatorial_map/include/CGAL/Combinatorial_map_functors.h
View File

@ -65,7 +65,7 @@ template<typename CMap>
struct Display_attribute_functor struct Display_attribute_functor
{ {
template <unsigned int i> template <unsigned int i>
static void run(const CMap* amap, static void run(const CMap* /*amap*/,
typename CMap::Dart_const_handle adart) typename CMap::Dart_const_handle adart)
{ {
if ( adart->template attribute<i>()==NULL ) if ( adart->template attribute<i>()==NULL )

2
Combinatorial_map/include/CGAL/internal/Combinatorial_map_sewable.h
View File

@ -156,7 +156,7 @@ struct Is_sewable_functor<CMap, 0, dim>
template<typename CMap> template<typename CMap>
struct Is_sewable_functor<CMap, 0, 1> struct Is_sewable_functor<CMap, 0, 1>
{ {
static bool run( const CMap* amap, static bool run( const CMap* /*amap*/,
typename CMap::Dart_const_handle adart1, typename CMap::Dart_const_handle adart1,
typename CMap::Dart_const_handle adart2 ) typename CMap::Dart_const_handle adart2 )
{ {

12
Combinatorial_map/test/Combinatorial_map/Combinatorial_map_2_test.h
View File

@ -28,18 +28,6 @@
using namespace std; using namespace std;
template<class Map>
void drawCell2 ( Map& amap, typename Map::Dart_handle adart, int aorbit, int mark )
{
/* cout << "Orbite " << Map::ORBIT_NAME[aorbit] << " (";
CGAL::CMap_dart_iterator_basic_of_orbit_2<Map> it2 ( amap, adart, aorbit, mark );
for ( ;it2.cont(); ++it2 )
{
cout << ( *it2 )->vertex()->point() << ", ";
}
cout << ")" << flush;*/
}
template<class Map> template<class Map>
void drawAllPoints( Map&amap ) void drawAllPoints( Map&amap )
{ {

12
Combinatorial_map/test/Combinatorial_map/Combinatorial_map_3_test.h
View File

@ -59,18 +59,6 @@ bool check_number_of_cells_3(CMap& cmap, unsigned int nbv, unsigned int nbe,
return true; return true;
} }
template<class Map>
void drawCell3(Map& amap, typename Map::Dart_handle adart, int aorbit, int mark)
{
cout << "Orbite " << Map::ORBIT_NAME[aorbit] << " (";
/* CGAL::CMap_dart_iterator_basic_of_orbit_3<Map> it2(amap, adart, aorbit, mark);
for (;it2.cont(); ++it2)
{
cout << (*it2)->vertex()->point() << ", ";
}*/
cout << ")" << flush;
}
template<class Map, class Functor> template<class Map, class Functor>
void createAllBasicCases1() void createAllBasicCases1()
{ {