From ecdac45ae666327a858825bc45758742a08cdb53 Mon Sep 17 00:00:00 2001 From: mkarlesky Date: Thu, 19 Feb 2009 23:07:40 +0000 Subject: [PATCH] added (void*) casts for TEST_ASSERT_EQUAL_MEMORY_MESSAGE git-svn-id: http://cmock.svn.sourceforge.net/svnroot/cmock/trunk@59 bf332499-1b4d-0410-844d-d2d48d5cc64c --- lib/cmock_generator_utils.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/cmock_generator_utils.rb b/lib/cmock_generator_utils.rb index 58c0a84..e131e7e 100644 --- a/lib/cmock_generator_utils.rb +++ b/lib/cmock_generator_utils.rb @@ -82,7 +82,7 @@ class CMockGeneratorUtils unity_msg = (unity_func =~ /_MESSAGE/) ? ", #{msg}" : '' if (unity_func == "TEST_ASSERT_EQUAL_MEMORY_MESSAGE") full_expected = (expected.strip[0] == 42) ? expected.slice(1..-1) : "&(#{expected})" - return "#{unity_func}(#{full_expected}, &(#{actual}), sizeof(#{c_type})#{unity_msg})" + return "#{unity_func}((void*)#{full_expected}, (void*)&(#{actual}), sizeof(#{c_type})#{unity_msg})" else return "#{unity_func}(#{expected}, #{actual}#{unity_msg})" end