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

Remove a warning

This commit is contained in:
Guillaume Damiand 2016-11-08 13:48:46 -05:00
parent a9ac4013fa
commit 269dcaf78d
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Combinatorial_map/test/Combinatorial_map/Combinatorial_map_copy_test.cpp
View File

@ -69,7 +69,8 @@ struct Map_3_dart_max_items_3
struct MonInfo struct MonInfo
{ {
MonInfo(int i=0) : mnb(i==0?rand():i), ptr(reinterpret_cast<char*>(this)) MonInfo(long long int i=0) : mnb(i==0?rand():i),
ptr(reinterpret_cast<char*>(this))
{} {}
int mnb; int mnb;
std::string s; std::string s;
@ -157,7 +158,7 @@ struct CreateAttributes
{ {
static void run(Map& map) static void run(Map& map)
{ {
int nb=0; long long int nb=0;
for(typename Map::Dart_range::iterator it=map.darts().begin(), for(typename Map::Dart_range::iterator it=map.darts().begin(),
itend=map.darts().end(); it!=itend; ++it) itend=map.darts().end(); it!=itend; ++it)
{ {
@ -181,7 +182,7 @@ struct InitDartInfo
{ {
static void run(Map& map) static void run(Map& map)
{ {
long int nb=0; long long int nb=0;
for(typename Map::Dart_range::iterator it=map.darts().begin(), for(typename Map::Dart_range::iterator it=map.darts().begin(),
itend=map.darts().end(); it!=itend; ++it) itend=map.darts().end(); it!=itend; ++it)
{ {

13
Linear_cell_complex/test/Linear_cell_complex/Linear_cell_complex_copy_test.cpp
View File

@ -91,7 +91,8 @@ public:
struct MonInfo struct MonInfo
{ {
MonInfo(int i=0) : mnb(i==0?rand():i), ptr(reinterpret_cast<char*>(this)) MonInfo(long long int i=0) : mnb(i==0?rand():i),
ptr(reinterpret_cast<char*>(this))
{} {}
int mnb; int mnb;
std::string s; std::string s;
@ -275,7 +276,7 @@ struct SetInfoIfNonVoid
{ {
static void run(Map& map, static void run(Map& map,
typename Map::template Attribute_handle<i>::type attr, typename Map::template Attribute_handle<i>::type attr,
long int nb) long long int nb)
{ {
map.template info_of_attribute<i>(attr)=nb; map.template info_of_attribute<i>(attr)=nb;
} }
@ -284,7 +285,7 @@ template<typename Map, int i>
struct SetInfoIfNonVoid<Map, i, void> struct SetInfoIfNonVoid<Map, i, void>
{ {
static void run(Map&, typename Map::template Attribute_handle<i>::type, static void run(Map&, typename Map::template Attribute_handle<i>::type,
long int) long long int)
{} {}
}; };
@ -294,7 +295,7 @@ struct CreateAttributes
{ {
static void run(Map& map) static void run(Map& map)
{ {
int nb=0; long long int nb=0;
for(typename Map::Dart_range::iterator it=map.darts().begin(), for(typename Map::Dart_range::iterator it=map.darts().begin(),
itend=map.darts().end(); it!=itend; ++it) itend=map.darts().end(); it!=itend; ++it)
{ {
@ -312,7 +313,7 @@ struct CreateAttributes<Map, 0, Attr>
{ {
static void run(Map& amap) static void run(Map& amap)
{ {
int nb=0; long long int nb=0;
for ( typename Map::template Attribute_range<0>::type::iterator for ( typename Map::template Attribute_range<0>::type::iterator
it=amap.template attributes<0>().begin(), it=amap.template attributes<0>().begin(),
itend=amap.template attributes<0>().end(); it!=itend; ++it ) itend=amap.template attributes<0>().end(); it!=itend; ++it )
@ -339,7 +340,7 @@ struct InitDartInfo
{ {
static void run(Map& map) static void run(Map& map)
{ {
long int nb=0; long long int nb=0;
for(typename Map::Dart_range::iterator it=map.darts().begin(), for(typename Map::Dart_range::iterator it=map.darts().begin(),
itend=map.darts().end(); it!=itend; ++it) itend=map.darts().end(); it!=itend; ++it)
{ {