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

Fix __GNUC__ tests

This commit is contained in:
Maxime Gimeno 2021-07-23 10:59:49 +02:00
parent 8aa6bb3953
commit 97cac65a86
15 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Arrangement_on_surface_2/include/CGAL/Arr_point_location/Td_X_trapezoid.h
View File

@ -122,7 +122,7 @@ public:
#if defined(__SUNPRO_CC) || defined(__PGI) || defined(__INTEL_COMPILER) #if defined(__SUNPRO_CC) || defined(__PGI) || defined(__INTEL_COMPILER)
friend class Trapezoidal_decomposition_2<Traits>::Around_point_circulator; friend class Trapezoidal_decomposition_2<Traits>::Around_point_circulator;
friend class Trapezoidal_decomposition_2<Traits>::In_face_iterator; friend class Trapezoidal_decomposition_2<Traits>::In_face_iterator;
#elif defined(__GNUC__) #elif (__GNUC__ > 0)
friend class Trapezoidal_decomposition_2<Traits>::Around_point_circulator; friend class Trapezoidal_decomposition_2<Traits>::Around_point_circulator;
friend class Trapezoidal_decomposition_2<Traits>::In_face_iterator; friend class Trapezoidal_decomposition_2<Traits>::In_face_iterator;

2
Arrangement_on_surface_2/include/CGAL/Arr_point_location/Td_active_edge.h
View File

@ -94,7 +94,7 @@ public:
#ifdef CGAL_PM_FRIEND_CLASS #ifdef CGAL_PM_FRIEND_CLASS
#if defined(__SUNPRO_CC) || defined(__PGI) || defined(__INTEL_COMPILER) #if defined(__SUNPRO_CC) || defined(__PGI) || defined(__INTEL_COMPILER)
friend class Trapezoidal_decomposition_2<Traits>::In_face_iterator; friend class Trapezoidal_decomposition_2<Traits>::In_face_iterator;
#elif defined(__GNUC__) #elif (__GNUC__ > 0)
friend class Trapezoidal_decomposition_2<Traits>::In_face_iterator; friend class Trapezoidal_decomposition_2<Traits>::In_face_iterator;
#else #else
friend class In_face_iterator; friend class In_face_iterator;

2
Arrangement_on_surface_2/include/CGAL/Arr_point_location/Td_active_fictitious_vertex.h
View File

@ -94,7 +94,7 @@ public:
#ifdef CGAL_PM_FRIEND_CLASS #ifdef CGAL_PM_FRIEND_CLASS
#if defined(__SUNPRO_CC) || defined(__PGI) || defined(__INTEL_COMPILER) #if defined(__SUNPRO_CC) || defined(__PGI) || defined(__INTEL_COMPILER)
friend class Trapezoidal_decomposition_2<Traits>::In_face_iterator; friend class Trapezoidal_decomposition_2<Traits>::In_face_iterator;
#elif defined(__GNUC__) #elif (__GNUC__ > 0)
friend class Trapezoidal_decomposition_2<Traits>::In_face_iterator; friend class Trapezoidal_decomposition_2<Traits>::In_face_iterator;
#else #else
friend class In_face_iterator; friend class In_face_iterator;

2
Arrangement_on_surface_2/include/CGAL/Arr_point_location/Td_active_trapezoid.h
View File

@ -91,7 +91,7 @@ public:
#ifdef CGAL_PM_FRIEND_CLASS #ifdef CGAL_PM_FRIEND_CLASS
#if defined(__SUNPRO_CC) || defined(__PGI) || defined(__INTEL_COMPILER) #if defined(__SUNPRO_CC) || defined(__PGI) || defined(__INTEL_COMPILER)
friend class Trapezoidal_decomposition_2<Traits>::In_face_iterator; friend class Trapezoidal_decomposition_2<Traits>::In_face_iterator;
#elif defined(__GNUC__) #elif (__GNUC__ > 0)
friend class Trapezoidal_decomposition_2<Traits>::In_face_iterator; friend class Trapezoidal_decomposition_2<Traits>::In_face_iterator;
#else #else
friend class In_face_iterator; friend class In_face_iterator;

2
Arrangement_on_surface_2/include/CGAL/Arr_point_location/Td_active_vertex.h
View File

@ -96,7 +96,7 @@ public:
#ifdef CGAL_PM_FRIEND_CLASS #ifdef CGAL_PM_FRIEND_CLASS
#if defined(__SUNPRO_CC) || defined(__PGI) || defined(__INTEL_COMPILER) #if defined(__SUNPRO_CC) || defined(__PGI) || defined(__INTEL_COMPILER)
friend class Trapezoidal_decomposition_2<Traits>::In_face_iterator; friend class Trapezoidal_decomposition_2<Traits>::In_face_iterator;
#elif defined(__GNUC__) #elif (__GNUC__ > 0)
friend class Trapezoidal_decomposition_2<Traits>::In_face_iterator; friend class Trapezoidal_decomposition_2<Traits>::In_face_iterator;
#else #else
friend class In_face_iterator; friend class In_face_iterator;

2
Arrangement_on_surface_2/include/CGAL/Arr_point_location/Td_inactive_edge.h
View File

@ -93,7 +93,7 @@ public:
#ifdef CGAL_PM_FRIEND_CLASS #ifdef CGAL_PM_FRIEND_CLASS
#if defined(__SUNPRO_CC) || defined(__PGI) || defined(__INTEL_COMPILER) #if defined(__SUNPRO_CC) || defined(__PGI) || defined(__INTEL_COMPILER)
friend class Trapezoidal_decomposition_2<Traits>::In_face_iterator; friend class Trapezoidal_decomposition_2<Traits>::In_face_iterator;
#elif defined(__GNUC__) #elif (__GNUC__ > 0)
friend class Trapezoidal_decomposition_2<Traits>::In_face_iterator; friend class Trapezoidal_decomposition_2<Traits>::In_face_iterator;
#else #else
friend class In_face_iterator; friend class In_face_iterator;

2
Arrangement_on_surface_2/include/CGAL/Arr_point_location/Td_inactive_fictitious_vertex.h
View File

@ -96,7 +96,7 @@ public:
#ifdef CGAL_PM_FRIEND_CLASS #ifdef CGAL_PM_FRIEND_CLASS
#if defined(__SUNPRO_CC) || defined(__PGI) || defined(__INTEL_COMPILER) #if defined(__SUNPRO_CC) || defined(__PGI) || defined(__INTEL_COMPILER)
friend class Trapezoidal_decomposition_2<Traits>::In_face_iterator; friend class Trapezoidal_decomposition_2<Traits>::In_face_iterator;
#elif defined(__GNUC__) #elif (__GNUC__ > 0)
friend class Trapezoidal_decomposition_2<Traits>::In_face_iterator; friend class Trapezoidal_decomposition_2<Traits>::In_face_iterator;
#else #else
friend class In_face_iterator; friend class In_face_iterator;

2
Arrangement_on_surface_2/include/CGAL/Arr_point_location/Td_inactive_vertex.h
View File

@ -92,7 +92,7 @@ public:
#ifdef CGAL_PM_FRIEND_CLASS #ifdef CGAL_PM_FRIEND_CLASS
#if defined(__SUNPRO_CC) || defined(__PGI) || defined(__INTEL_COMPILER) #if defined(__SUNPRO_CC) || defined(__PGI) || defined(__INTEL_COMPILER)
friend class Trapezoidal_decomposition_2<Traits>::In_face_iterator; friend class Trapezoidal_decomposition_2<Traits>::In_face_iterator;
#elif defined(__GNUC__) #elif (__GNUC__ > 0)
friend class Trapezoidal_decomposition_2<Traits>::In_face_iterator; friend class Trapezoidal_decomposition_2<Traits>::In_face_iterator;
#else #else
friend class In_face_iterator; friend class In_face_iterator;

2
Circular_kernel_2/benchmark/parser/benchmark_parser.cpp
View File

@ -232,7 +232,7 @@ union yyalloc
/* Copy COUNT objects from FROM to TO. The source and destination do /* Copy COUNT objects from FROM to TO. The source and destination do
not overlap. */ not overlap. */
# ifndef YYCOPY # ifndef YYCOPY
# if defined (__GNUC__) # if (__GNUC__ > 0)
# define YYCOPY(To, From, Count) \ # define YYCOPY(To, From, Count) \
__builtin_memcpy (To, From, (Count) * sizeof (*(From))) __builtin_memcpy (To, From, (Count) * sizeof (*(From)))
# else # else

2
Installation/cmake/modules/config/support/CGAL_test_cpp_version.cpp
View File

@ -18,7 +18,7 @@ int main() {
#endif #endif
#if __has_feature(cxx_thread_local) || \ #if __has_feature(cxx_thread_local) || \
( defined(__GNUC__) && __cplusplus >= 201103L ) ( __GNUC__ > 0 && __cplusplus >= 201103L )
return 0; return 0;
#else #else
return 1; return 1;

8
Installation/include/CGAL/config.h
View File

@ -223,7 +223,7 @@
#define CGAL_CFG_NO_TR1_ARRAY 1 #define CGAL_CFG_NO_TR1_ARRAY 1
// never use TR1 // never use TR1
#define CGAL_CFG_NO_TR1_TUPLE 1 #define CGAL_CFG_NO_TR1_TUPLE 1
#if !defined(__GNUC__) || defined(__INTEL_COMPILER) #if (__GNUC__ <= 0) || defined(__INTEL_COMPILER)
#define CGAL_CFG_NO_STATEMENT_EXPRESSIONS 1 #define CGAL_CFG_NO_STATEMENT_EXPRESSIONS 1
#endif #endif
#if _MSC_VER==1800 #if _MSC_VER==1800
@ -509,20 +509,20 @@ using std::max;
#endif #endif
#if __has_feature(cxx_thread_local) || \ #if __has_feature(cxx_thread_local) || \
( defined(__GNUC__) && __cplusplus >= 201103L ) || \ ( (__GNUC__ > 0) && __cplusplus >= 201103L ) || \
( _MSC_VER >= 1900 ) ( _MSC_VER >= 1900 )
// see also Installation/cmake/modules/config/support/CGAL_test_cpp_version.cpp // see also Installation/cmake/modules/config/support/CGAL_test_cpp_version.cpp
#define CGAL_CAN_USE_CXX11_THREAD_LOCAL #define CGAL_CAN_USE_CXX11_THREAD_LOCAL
#endif #endif
#if (__has_include(<mutex>) && __cplusplus >= 201103L ) | \ #if (__has_include(<mutex>) && __cplusplus >= 201103L ) | \
( defined(__GNUC__) && __cplusplus >= 201103L ) || \ ( (__GNUC__ > 0) && __cplusplus >= 201103L ) || \
( _MSC_VER >= 1700 ) ( _MSC_VER >= 1700 )
#define CGAL_CAN_USE_CXX11_MUTEX #define CGAL_CAN_USE_CXX11_MUTEX
#endif #endif
#if (__has_include(<atomic>) && __cplusplus >= 201103L ) || \ #if (__has_include(<atomic>) && __cplusplus >= 201103L ) || \
( defined(__GNUC__) && __cplusplus >= 201103L ) || \ ( (__GNUC__ > 0) && __cplusplus >= 201103L ) || \
( _MSC_VER >= 1700 ) ( _MSC_VER >= 1700 )
#define CGAL_CAN_USE_CXX11_ATOMIC #define CGAL_CAN_USE_CXX11_ATOMIC
#endif #endif

2
Installation/include/CGAL/internal/deprecation_warning.h
View File

@ -75,7 +75,7 @@ CGAL_static_assertion_msg(false, CGAL_INTERNAL_DEPRECATED_MESSAGE);
#elif !defined(CGAL_NO_DEPRECATION_WARNINGS) // don't trigger on NO_DEPRECATION_WARNINGS #elif !defined(CGAL_NO_DEPRECATION_WARNINGS) // don't trigger on NO_DEPRECATION_WARNINGS
# if defined(_MSC_VER) || defined(__BORLANDC__) || defined(__DMC__) # if defined(_MSC_VER) || defined(__BORLANDC__) || defined(__DMC__)
# pragma message (CGAL_INTERNAL_DEPRECATED_MESSAGE) # pragma message (CGAL_INTERNAL_DEPRECATED_MESSAGE)
# elif defined(__GNUC__) || defined(__HP_aCC) || defined(__SUNPRO_CC) || defined(__IBMCPP__) # elif (__GNUC__ > 0) || defined(__HP_aCC) || defined(__SUNPRO_CC) || defined(__IBMCPP__)
// warning does not expand its arguments, issue a warning and add the message. // warning does not expand its arguments, issue a warning and add the message.
# warning "A deprecated header has been included." # warning "A deprecated header has been included."
# pragma message (CGAL_INTERNAL_DEPRECATED_MESSAGE) # pragma message (CGAL_INTERNAL_DEPRECATED_MESSAGE)

2
Number_types/include/CGAL/FPU.h
View File

@ -172,7 +172,7 @@ inline double IA_opacify(double x)
// Intel has a bug where -mno-sse still defines __SSE__ and __SSE2__ // Intel has a bug where -mno-sse still defines __SSE__ and __SSE2__
// (-mno-sse2 works though), no work-around for now. // (-mno-sse2 works though), no work-around for now.
# if defined __SSE2_MATH__ || (defined __INTEL_COMPILER && defined __SSE2__) # if defined __SSE2_MATH__ || (defined __INTEL_COMPILER && defined __SSE2__)
# if defined(__GNUC__) # if (__GNUC__ > 0)
// ICEs in reload/LRA with older versions. // ICEs in reload/LRA with older versions.
asm volatile ("" : "+gx"(x) ); asm volatile ("" : "+gx"(x) );
# else # else

2
Periodic_3_triangulation_3/test/Periodic_3_triangulation_3/include/CGAL/_test_cls_periodic_3_regular_triangulation_traits_3.h
View File

@ -10,7 +10,7 @@
// Author(s) : Aymeric PELLE <aymeric.pelle@sophia.inria.fr> // Author(s) : Aymeric PELLE <aymeric.pelle@sophia.inria.fr>
// Mael Rouxel-Labbé // Mael Rouxel-Labbé
#if defined(__GNUC__) #if (__GNUC__ > 0)
# pragma GCC diagnostic ignored "-Wunused-but-set-variable" # pragma GCC diagnostic ignored "-Wunused-but-set-variable"
#endif #endif

2
Periodic_3_triangulation_3/test/Periodic_3_triangulation_3/include/CGAL/_test_cls_periodic_3_triangulation_traits_3.h
View File

@ -11,7 +11,7 @@
// Author(s) : Mariette Yvinec <Mariette.Yvinec@sophia.inria.fr> // Author(s) : Mariette Yvinec <Mariette.Yvinec@sophia.inria.fr>
// Manuel Caroli <Manuel.Caroli@sophia.inria.fr> // Manuel Caroli <Manuel.Caroli@sophia.inria.fr>
#if defined(__GNUC__) #if (__GNUC__ > 0)
# pragma GCC diagnostic ignored "-Wunused-but-set-variable" # pragma GCC diagnostic ignored "-Wunused-but-set-variable"
#endif #endif