Merge commit 'e1007ae7bd3a09b09108410ec3ba6b0e450e1d53' into HEAD

serializer/tests/multitree_ut/multitree_ut.cpp

@@ -349,7 +349,7 @@ TEST_FUNCTION_CLEANUP(clean)
     if (BASEIMPLEMENTATION::gballoc_getCurrentMemoryUsed() != 0)
     {
         char temp[1000];
-        sprintf(temp, "Test did not clean memory properly, leaking %lu bytes", (long unsigned int)BASEIMPLEMENTATION::gballoc_getCurrentMemoryUsed());
+        sprintf(temp, "Test did not clean memory properly, leaking %zu bytes", BASEIMPLEMENTATION::gballoc_getCurrentMemoryUsed());
         BASEIMPLEMENTATION::gballoc_deinit();
         ASSERT_FAIL(temp);
     }

testtools/iothub_test/src/iothubtest.c

@@ -1329,7 +1329,7 @@ IOTHUB_TEST_CLIENT_RESULT IoTHubTest_SendMessage(IOTHUB_TEST_HANDLE devhubHandle
         ((len == 0) && (data != NULL)) ||
         ((data != NULL) && (len == 0)))
     {
-        LogError("Invalid arguments for IoTHubTest_SendMessage, devhubHandle = %p, len = %lu, data = %p.", devhubHandle, (unsigned long)len, data);
+        LogError("Invalid arguments for IoTHubTest_SendMessage, devhubHandle = %p, len = %zu, data = %p.", devhubHandle, len, data);
         result = IOTHUB_TEST_CLIENT_ERROR;
     }
     else