Skip to content
This repository was archived by the owner on Sep 30, 2022. It is now read-only.

Commit 9501f45

Browse files
ggouaillardetjsquyres
authored andcommitted
opal: fix pragma for GCC 6 and later
GCC 6 and later should ignore -Wpedantic instead of -pedantic (cherry picked from commit open-mpi/ompi@e5d6b97)
1 parent 0c5d83d commit 9501f45

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

opal/include/opal_stdint.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
* All rights reserved.
1313
* Copyright (c) 2015 Los Alamos National Security, LLC. All rights
1414
* reserved.
15+
* Copyright (c) 2016 Research Organization for Information Science
16+
* and Technology (RIST). All rights reserved.
1517
* $COPYRIGHT$
1618
*
1719
* Additional copyrights may follow
@@ -52,7 +54,7 @@ typedef uint128_t opal_uint128_t;
5254
/* Clang won't quietly accept "-pedantic", but GCC versions older than ~4.8
5355
* won't quietly accept "-Wpedanic". The whole "#pragma GCC diagnostic ..."
5456
* facility only was added to GCC as of version 4.6. */
55-
#if defined(__clang__)
57+
#if defined(__clang__) || (defined(__GNUC__) && __GNUC__ >= 6)
5658
#pragma GCC diagnostic ignored "-Wpedantic"
5759
#else
5860
#pragma GCC diagnostic ignored "-pedantic"

0 commit comments

Comments
 (0)