From 08b255868a50faeae359f272c8af0d16c0e4abf4 Mon Sep 17 00:00:00 2001 From: krsk Date: Wed, 14 Sep 2016 12:02:16 +0200 Subject: [PATCH] Push and pop GCC diagnostics to maintain scope for changed warning flags --- lib/cmock_generator.rb | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/lib/cmock_generator.rb b/lib/cmock_generator.rb index 7009ece..1414c4a 100644 --- a/lib/cmock_generator.rb +++ b/lib/cmock_generator.rb @@ -102,6 +102,7 @@ class CMockGenerator file << "\n" file << "/* Ignore the following warnings, since we are copying code */\n" file << "#if defined(__GNUC__) && !defined(__ICC) && !defined(__TMS470__)\n" + file << "#pragma GCC diagnostic push\n" file << "#if !defined(__clang__)\n" file << "#pragma GCC diagnostic ignored \"-Wpragmas\"\n" file << "#endif\n" @@ -124,7 +125,12 @@ class CMockGenerator end def create_mock_header_footer(header) - header << "\n#endif\n" + header << "\n" + header << "#if defined(__GNUC__) && !defined(__ICC) && !defined(__TMS470__)\n" + header << "#pragma GCC diagnostic pop\n" + header << "#endif\n" + header << "\n" + header << "#endif\n" end def create_source_header_section(file, filename, functions)