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

Merge branch 'CGAL-fix_warnings-GF' of ssh://scm.cgal.org/var/git/cgal into CGAL-fix_warnings-GF

This commit is contained in:
Andreas Fabri 2013-03-05 15:31:20 +01:00
parent 0707d8b9be 5e2ced646d
commit 5156965f36
4 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -36,8 +36,10 @@
#include <boost/type_traits/is_same.hpp>
// suppress bogus warning when compiling with gcc 4.3 or 4.4
#if (__GNUC__ == 4 && (__GNUC_MINOR__ == 3 || __GNUC_MINOR__ == 4))
#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

3
Installation/cmake/modules/CGAL_Locate_CGAL_TAUCS.cmake
View File

@ -82,7 +82,8 @@ if ( NOT CGAL_TAUCS_FOUND )
set( CGAL_TAUCS_FOUND TRUE )
# Else, search for TAUCS in CGAL "auxiliary" folder
elseif ( EXISTS "${CGAL_INSTALLATION_PACKAGE_DIR}/auxiliary/taucs" )
elseif ( EXISTS "${CGAL_INSTALLATION_PACKAGE_DIR}/auxiliary/taucs/include" AND
EXISTS "${CGAL_INSTALLATION_PACKAGE_DIR}/auxiliary/taucs/lib" )
set( CGAL_TAUCS_INCLUDE_DIR "${CGAL_INSTALLATION_PACKAGE_DIR}/auxiliary/taucs/include")
set( CGAL_TAUCS_LIBRARIES_DIR "${CGAL_INSTALLATION_PACKAGE_DIR}/auxiliary/taucs/lib" )

6
Polyhedron/demo/Polyhedron/Polyhedron_demo_gocad_plugin.cpp
View File

@ -47,9 +47,9 @@ public:
}
for(size_type i=0; i < mesh.size(); i++){
B.begin_facet();
B.add_vertex_to_facet( mesh[i].get<0>());
B.add_vertex_to_facet( mesh[i].get<1>());
B.add_vertex_to_facet( mesh[i].get<2>());
B.add_vertex_to_facet( mesh[i].template get<0>());
B.add_vertex_to_facet( mesh[i].template get<1>());
B.add_vertex_to_facet( mesh[i].template get<2>());
B.end_facet();
}
if(B.error())

6
Polyhedron/demo/Polyhedron/Polyhedron_demo_stl_plugin.cpp
View File

@ -47,9 +47,9 @@ public:
}
for(size_type i=0; i < mesh.size(); i++){
B.begin_facet();
B.add_vertex_to_facet( mesh[i].get<0>());
B.add_vertex_to_facet( mesh[i].get<1>());
B.add_vertex_to_facet( mesh[i].get<2>());
B.add_vertex_to_facet( mesh[i].template get<0>());
B.add_vertex_to_facet( mesh[i].template get<1>());
B.add_vertex_to_facet( mesh[i].template get<2>());
B.end_facet();
}
if(B.error())