Mirrors/CMock
1
0
Fork 0
mirror of https://github.com/ThrowTheSwitch/CMock synced 2025-06-02 04:09:34 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request from Yagoor/contribution/extern-c

Browse Source 
Added extern "C" to cmock generated headers
This commit is contained in:
Mark VanderVoord 2022-10-02 20:12:59 -04:00 committed by GitHub
commit d3962d56c3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 28 additions and 0 deletions

8
lib/cmock_generator.rb

@ -169,6 +169,10 @@ class CMockGenerator
file << "#pragma GCC diagnostic ignored \"-Wduplicate-decl-specifier\"\n"
file << "#endif\n"
file << "\n"
file << "#ifdef __cplusplus\n"
file << "extern \"C\" {\n"
file << "#endif\n"
file << "\n"
end
def create_typedefs(file, mock_project)
@ -184,6 +188,10 @@ class CMockGenerator
end
def create_mock_header_footer(header)
header << "\n"
header << "#ifdef __cplusplus\n"
header << "}\n"
header << "#endif\n"
header << "\n"
header << "#if defined(__GNUC__) && !defined(__ICC) && !defined(__TMS470__)\n"
header << "#if __GNUC__ > 4 || (__GNUC__ == 4 && (__GNUC_MINOR__ > 6 || (__GNUC_MINOR__ == 6 && __GNUC_PATCHLEVEL__ > 0)))\n"

20
test/unit/cmock_generator_main_test.rb

@ -123,6 +123,10 @@ describe CMockGenerator, "Verify CMockGenerator Module" do
"#pragma GCC diagnostic ignored \"-Wduplicate-decl-specifier\"\n",
"#endif\n",
"\n",
"#ifdef __cplusplus\n",
"extern \"C\" {\n",
"#endif\n",
"\n",
]
@config.expect :orig_header_include_fmt, "#include \"%s\""
@ -173,6 +177,10 @@ describe CMockGenerator, "Verify CMockGenerator Module" do
"#pragma GCC diagnostic ignored \"-Wduplicate-decl-specifier\"\n",
"#endif\n",
"\n",
"#ifdef __cplusplus\n",
"extern \"C\" {\n",
"#endif\n",
"\n",
]
@config.expect :orig_header_include_fmt, "#include \"%s\""
@ -217,6 +225,10 @@ describe CMockGenerator, "Verify CMockGenerator Module" do
"#pragma GCC diagnostic ignored \"-Wduplicate-decl-specifier\"\n",
"#endif\n",
"\n",
"#ifdef __cplusplus\n",
"extern \"C\" {\n",
"#endif\n",
"\n",
]
@config.expect :orig_header_include_fmt, "#include \"%s\""
@ -256,6 +268,10 @@ describe CMockGenerator, "Verify CMockGenerator Module" do
"#pragma GCC diagnostic ignored \"-Wduplicate-decl-specifier\"\n",
"#endif\n",
"\n",
"#ifdef __cplusplus\n",
"extern \"C\" {\n",
"#endif\n",
"\n",
]
@config.expect :orig_header_include_fmt, "#include \"%s\""
@ -302,6 +318,10 @@ describe CMockGenerator, "Verify CMockGenerator Module" do
it "append the proper footer to the header file" do
output = []
expected = ["\n",
"#ifdef __cplusplus\n",
"}\n",
"#endif\n",
"\n",
"#if defined(__GNUC__) && !defined(__ICC) && !defined(__TMS470__)\n",
"#if __GNUC__ > 4 || (__GNUC__ == 4 && (__GNUC_MINOR__ > 6 || (__GNUC_MINOR__ == 6 && __GNUC_PATCHLEVEL__ > 0)))\n",
"#pragma GCC diagnostic pop\n",