ThrowTheSwitch/CMock
1
0
Fork 0
mirror of https://github.com/ThrowTheSwitch/CMock.git synced 2026-08-18 17:19:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Better way to fix a 'return from incompatible pointer type' compiler warning for const return types.

Browse Source
This commit is contained in:
Jocelyn Le Sage
2014-05-08 14:20:22 -04:00
parent b9b68bd26c
commit ca13c8361c
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/cmock_generator.rb
+2 -1
View File
@@ -183,8 +183,9 @@ class CMockGenerator
file << " UNITY_TEST_FAIL(cmock_line, \"Function '#{function[:name]}' called later than expected.\");\n"
# file << " UNITY_TEST_ASSERT((cmock_call_instance->CallOrder == ++GlobalVerifyOrder), cmock_line, \"Out of order function calls. Function '#{function[:name]}'\");\n"
end
return_type_cast = function[:return][:const?] ? "(const #{function[:return][:type]})" : ''
file << @plugins.run(:mock_implementation, function)
file << " return cmock_call_instance->ReturnVal;\n" unless (function[:return][:void?])
file << " return #{return_type_cast}cmock_call_instance->ReturnVal;\n" unless (function[:return][:void?])
file << "}\n\n"
end