ThrowTheSwitch/CMock
1
0
Fork 0
mirror of https://github.com/ThrowTheSwitch/CMock.git synced 2026-09-02 00:09:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/ThrowTheSwitch/CMock

Browse Source
This commit is contained in:
Mark VanderVoord
2016-08-11 12:40:18 -04:00
parent 0996f5fb55 3aa9f60991
commit 25f4c65ecf
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/cmock_generator.rb
+1 -1
View File
@@ -100,7 +100,7 @@ class CMockGenerator
file << plugin_includes if (!plugin_includes.empty?) file << plugin_includes if (!plugin_includes.empty?)
file << "\n" file << "\n"
file << "/* Ignore the following warnings, since we are copying code */\n" file << "/* Ignore the following warnings, since we are copying code */\n"
file << "#if defined(__GNUC__) && !defined(__ICC)\n" file << "#if defined(__GNUC__) && !defined(__ICC) && !defined(__TMS470__)\n"
file << "#if !defined(__clang__)\n" file << "#if !defined(__clang__)\n"
file << "#pragma GCC diagnostic ignored \"-Wpragmas\"\n" file << "#pragma GCC diagnostic ignored \"-Wpragmas\"\n"
file << "#endif\n" file << "#endif\n"
test/unit/cmock_generator_main_test.rb
+4 -4
View File
@@ -94,7 +94,7 @@ describe CMockGenerator, "Verify CMockGenerator Module" do
"#include \"PluginRequiredHeader.h\"\n", "#include \"PluginRequiredHeader.h\"\n",
"\n", "\n",
"/* Ignore the following warnings, since we are copying code */\n", "/* Ignore the following warnings, since we are copying code */\n",
"#if defined(__GNUC__) && !defined(__ICC)\n", "#if defined(__GNUC__) && !defined(__ICC) && !defined(__TMS470__)\n",
"#if !defined(__clang__)\n", "#if !defined(__clang__)\n",
"#pragma GCC diagnostic ignored \"-Wpragmas\"\n", "#pragma GCC diagnostic ignored \"-Wpragmas\"\n",
"#endif\n", "#endif\n",
@@ -144,7 +144,7 @@ describe CMockGenerator, "Verify CMockGenerator Module" do
"#include \"PluginRequiredHeader.h\"\n", "#include \"PluginRequiredHeader.h\"\n",
"\n", "\n",
"/* Ignore the following warnings, since we are copying code */\n", "/* Ignore the following warnings, since we are copying code */\n",
"#if defined(__GNUC__) && !defined(__ICC)\n", "#if defined(__GNUC__) && !defined(__ICC) && !defined(__TMS470__)\n",
"#if !defined(__clang__)\n", "#if !defined(__clang__)\n",
"#pragma GCC diagnostic ignored \"-Wpragmas\"\n", "#pragma GCC diagnostic ignored \"-Wpragmas\"\n",
"#endif\n", "#endif\n",
@@ -178,7 +178,7 @@ describe CMockGenerator, "Verify CMockGenerator Module" do
"#include \"#{orig_filename}\"\n", "#include \"#{orig_filename}\"\n",
"\n", "\n",
"/* Ignore the following warnings, since we are copying code */\n", "/* Ignore the following warnings, since we are copying code */\n",
"#if defined(__GNUC__) && !defined(__ICC)\n", "#if defined(__GNUC__) && !defined(__ICC) && !defined(__TMS470__)\n",
"#if !defined(__clang__)\n", "#if !defined(__clang__)\n",
"#pragma GCC diagnostic ignored \"-Wpragmas\"\n", "#pragma GCC diagnostic ignored \"-Wpragmas\"\n",
"#endif\n", "#endif\n",
@@ -213,7 +213,7 @@ describe CMockGenerator, "Verify CMockGenerator Module" do
"#include \"PluginRequiredHeader.h\"\n", "#include \"PluginRequiredHeader.h\"\n",
"\n", "\n",
"/* Ignore the following warnings, since we are copying code */\n", "/* Ignore the following warnings, since we are copying code */\n",
"#if defined(__GNUC__) && !defined(__ICC)\n", "#if defined(__GNUC__) && !defined(__ICC) && !defined(__TMS470__)\n",
"#if !defined(__clang__)\n", "#if !defined(__clang__)\n",
"#pragma GCC diagnostic ignored \"-Wpragmas\"\n", "#pragma GCC diagnostic ignored \"-Wpragmas\"\n",
"#endif\n", "#endif\n",