From ca13c8361c0732b46e1f573a597dc5c0f78e7d23 Mon Sep 17 00:00:00 2001 From: Jocelyn Le Sage Date: Thu, 8 May 2014 14:20:22 -0400 Subject: [PATCH] Better way to fix a 'return from incompatible pointer type' compiler warning for const return types. --- lib/cmock_generator.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/cmock_generator.rb b/lib/cmock_generator.rb index b603098..a676924 100644 --- a/lib/cmock_generator.rb +++ b/lib/cmock_generator.rb @@ -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