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

Merge pull request #33 from jlesage/cast_return_type

Browse Source 
Fixed another 'return from incompatible pointer type' compiler warning (Thanks Jocelyn!)
This commit is contained in:
Mark VanderVoord
2014-05-22 08:01:20 -04:00
parent 5d79cf8e56 5c07c70e93
commit dfc238ea94
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/cmock_generator_plugin_expect_any_args.rb
+2 -1
View File
@@ -45,7 +45,8 @@ class CMockGeneratorPluginExpectAnyArgs
else
retval = function[:return].merge( { :name => "cmock_call_instance->ReturnVal"} )
lines << " " + @utils.code_assign_argument_quickly("Mock.#{function[:name]}_FinalReturn", retval) unless (retval[:void?])
lines << " return cmock_call_instance->ReturnVal;\n }\n"
return_type_cast = function[:return][:const?] ? "(const #{function[:return][:type]})" : ''
lines << " return #{return_type_cast}cmock_call_instance->ReturnVal;\n }\n"
end
lines
end