ThrowTheSwitch/CMock
1
0
Fork 0
mirror of https://github.com/ThrowTheSwitch/CMock.git synced 2026-10-15 21:37:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed 'return from incompatible pointer type' compiler warnings that were produced by generated code for functions having 'const ptr' has return value.

Browse Source
This commit is contained in:
Jocelyn Le Sage
2014-05-06 09:25:24 -04:00
parent 053c3b67f1
commit fbda0d96f6
2 changed files with 5 additions and 3 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 = function[:return][:const?] ? "const #{function[:return][:type]}" : function[:return][:type]
file << @plugins.run(:mock_implementation, function)
file << " return cmock_call_instance->ReturnVal;\n" unless (function[:return][:void?])
file << " return (#{return_type})cmock_call_instance->ReturnVal;\n" unless (function[:return][:void?])
file << "}\n\n"
end
lib/cmock_generator_plugin_ignore.rb
+3 -2
View File
@@ -39,9 +39,10 @@ class CMockGeneratorPluginIgnore
lines << " return;\n }\n"
else
retval = function[:return].merge( { :name => "cmock_call_instance->ReturnVal"} )
lines << " if (cmock_call_instance == NULL)\n return Mock.#{function[:name]}_FinalReturn;\n"
return_type = function[:return][:const?] ? "const #{function[:return][:type]}" : function[:return][:type]
lines << " if (cmock_call_instance == NULL)\n return (#{return_type})Mock.#{function[:name]}_FinalReturn;\n"
lines << " " + @utils.code_assign_argument_quickly("Mock.#{function[:name]}_FinalReturn", retval) unless (retval[:void?])
lines << " return cmock_call_instance->ReturnVal;\n }\n"
lines << " return (#{return_type})cmock_call_instance->ReturnVal;\n }\n"
end
lines
end