Skip to content

Commit f43de68

Browse files
committed
ignore unused-local-typedefs for clang too
(#534)
1 parent 0371c1c commit f43de68

36 files changed

+65
-44
lines changed

SConstruct

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1497,7 +1497,7 @@ def CheckBoostPython(config):
14971497
bp_source_file = """
14981498
14991499
#ifndef __INTEL_COMPILER
1500-
#if defined(__GNUC__) && __GNUC__ >= 4 //&& (__GNUC__ >= 5 || __GNUC_MINOR__ >= 8)
1500+
#if defined(__clang__) || (defined(__GNUC__) && __GNUC__ >= 4 && (__GNUC__ >= 5 || __GNUC_MINOR__ >= 8))
15011501
#pragma GCC diagnostic ignored "-Wunused-local-typedefs"
15021502
#endif
15031503
#endif
@@ -1539,7 +1539,7 @@ BOOST_PYTHON_MODULE(check_bp) {
15391539
def CheckPythonExcept(config):
15401540
cpp_source_file = """
15411541
#ifndef __INTEL_COMPILER
1542-
#if defined(__GNUC__) && __GNUC__ >= 4 //&& (__GNUC__ >= 5 || __GNUC_MINOR__ >= 8)
1542+
#if defined(__clang__) || (defined(__GNUC__) && __GNUC__ >= 4 && (__GNUC__ >= 5 || __GNUC_MINOR__ >= 8))
15431543
#pragma GCC diagnostic ignored "-Wunused-local-typedefs"
15441544
#endif
15451545
#endif

pysrc/Angle.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,9 @@
1616
* this list of conditions, and the disclaimer given in the documentation
1717
* and/or other materials provided with the distribution.
1818
*/
19+
1920
#ifndef __INTEL_COMPILER
20-
#if defined(__GNUC__) && __GNUC__ >= 4 && (__GNUC__ >= 5 || __GNUC_MINOR__ >= 8)
21+
#if defined(__clang__) || (defined(__GNUC__) && __GNUC__ >= 4 && (__GNUC__ >= 5 || __GNUC_MINOR__ >= 8))
2122
#pragma GCC diagnostic ignored "-Wunused-local-typedefs"
2223
#endif
2324
#endif

pysrc/Bessel.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,9 @@
1616
* this list of conditions, and the disclaimer given in the documentation
1717
* and/or other materials provided with the distribution.
1818
*/
19+
1920
#ifndef __INTEL_COMPILER
20-
#if defined(__GNUC__) && __GNUC__ >= 4 && (__GNUC__ >= 5 || __GNUC_MINOR__ >= 8)
21+
#if defined(__clang__) || (defined(__GNUC__) && __GNUC__ >= 4 && (__GNUC__ >= 5 || __GNUC_MINOR__ >= 8))
2122
#pragma GCC diagnostic ignored "-Wunused-local-typedefs"
2223
#endif
2324
#endif

pysrc/Bounds.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
*/
1919

2020
#ifndef __INTEL_COMPILER
21-
#if defined(__GNUC__) && __GNUC__ >= 4 && (__GNUC__ >= 5 || __GNUC_MINOR__ >= 8)
21+
#if defined(__clang__) || (defined(__GNUC__) && __GNUC__ >= 4 && (__GNUC__ >= 5 || __GNUC_MINOR__ >= 8))
2222
#pragma GCC diagnostic ignored "-Wunused-local-typedefs"
2323
#endif
2424
#endif

pysrc/CDModel.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,9 @@
1616
* this list of conditions, and the disclaimer given in the documentation
1717
* and/or other materials provided with the distribution.
1818
*/
19+
1920
#ifndef __INTEL_COMPILER
20-
#if defined(__GNUC__) && __GNUC__ >= 4 && (__GNUC__ >= 5 || __GNUC_MINOR__ >= 8)
21+
#if defined(__clang__) || (defined(__GNUC__) && __GNUC__ >= 4 && (__GNUC__ >= 5 || __GNUC_MINOR__ >= 8))
2122
#pragma GCC diagnostic ignored "-Wunused-local-typedefs"
2223
#endif
2324
#endif

pysrc/CorrelatedNoise.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,9 @@
1616
* this list of conditions, and the disclaimer given in the documentation
1717
* and/or other materials provided with the distribution.
1818
*/
19+
1920
#ifndef __INTEL_COMPILER
20-
#if defined(__GNUC__) && __GNUC__ >= 4 && (__GNUC__ >= 5 || __GNUC_MINOR__ >= 8)
21+
#if defined(__clang__) || (defined(__GNUC__) && __GNUC__ >= 4 && (__GNUC__ >= 5 || __GNUC_MINOR__ >= 8))
2122
#pragma GCC diagnostic ignored "-Wunused-local-typedefs"
2223
#endif
2324
#endif

pysrc/HSM.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,11 @@
1616
* this list of conditions, and the disclaimer given in the documentation
1717
* and/or other materials provided with the distribution.
1818
*/
19+
1920
#define BOOST_PYTHON_MAX_ARITY 22 // We have a function with 21 params here...
2021
// c.f. www.boost.org/libs/python/doc/v2/configuration.html
2122
#ifndef __INTEL_COMPILER
22-
#if defined(__GNUC__) && __GNUC__ >= 4 && (__GNUC__ >= 5 || __GNUC_MINOR__ >= 8)
23+
#if defined(__clang__) || (defined(__GNUC__) && __GNUC__ >= 4 && (__GNUC__ >= 5 || __GNUC_MINOR__ >= 8))
2324
#pragma GCC diagnostic ignored "-Wunused-local-typedefs"
2425
#endif
2526
#endif

pysrc/Image.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
*/
1919

2020
#ifndef __INTEL_COMPILER
21-
#if defined(__GNUC__) && __GNUC__ >= 4 && (__GNUC__ >= 5 || __GNUC_MINOR__ >= 8)
21+
#if defined(__clang__) || (defined(__GNUC__) && __GNUC__ >= 4 && (__GNUC__ >= 5 || __GNUC_MINOR__ >= 8))
2222
#pragma GCC diagnostic ignored "-Wunused-local-typedefs"
2323
#endif
2424
#endif

pysrc/Integ.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,9 @@
1616
* this list of conditions, and the disclaimer given in the documentation
1717
* and/or other materials provided with the distribution.
1818
*/
19+
1920
#ifndef __INTEL_COMPILER
20-
#if defined(__GNUC__) && __GNUC__ >= 4 && (__GNUC__ >= 5 || __GNUC_MINOR__ >= 8)
21+
#if defined(__clang__) || (defined(__GNUC__) && __GNUC__ >= 4 && (__GNUC__ >= 5 || __GNUC_MINOR__ >= 8))
2122
#pragma GCC diagnostic ignored "-Wunused-local-typedefs"
2223
#endif
2324
#endif

pysrc/Interpolant.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,9 @@
1616
* this list of conditions, and the disclaimer given in the documentation
1717
* and/or other materials provided with the distribution.
1818
*/
19+
1920
#ifndef __INTEL_COMPILER
20-
#if defined(__GNUC__) && __GNUC__ >= 4 && (__GNUC__ >= 5 || __GNUC_MINOR__ >= 8)
21+
#if defined(__clang__) || (defined(__GNUC__) && __GNUC__ >= 4 && (__GNUC__ >= 5 || __GNUC_MINOR__ >= 8))
2122
#pragma GCC diagnostic ignored "-Wunused-local-typedefs"
2223
#endif
2324
#endif

0 commit comments

Comments
 (0)