Update to Latest submodules and fixing iothubhttp_ut

embdur · Aug 12, 2016 · 90c4295 · 90c4295
1 parent bd8509e
commit 90c4295
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/deps/azure-c-shared-utility b/deps/azure-c-shared-utility
diff --git a/deps/azure-iot-sdks b/deps/azure-iot-sdks
diff --git a/modules/iothubhttp/tests/iothubhttp_ut/iothubhttp_ut.cpp b/modules/iothubhttp/tests/iothubhttp_ut/iothubhttp_ut.cpp
@@ -544,7 +544,7 @@ TYPED_MOCK_CLASS(CIoTHubHTTPMocks, CGlobalMock)
         }
         else
         {
-            result2 = BASEIMPLEMENTATION::gballoc_malloc(1);
+            result2 = (IOTHUB_MESSAGE_HANDLE)BASEIMPLEMENTATION::gballoc_malloc(1);
         }
 
     MOCK_METHOD_END(IOTHUB_MESSAGE_HANDLE, result2);
-Original file line number
+Diff line change
@@ Expand Up / @@ -544,7 +544,7 @@ TYPED_MOCK_CLASS(CIoTHubHTTPMocks, CGlobalMock) @@
             }
             else
             {
-                result2 = BASEIMPLEMENTATION::gballoc_malloc(1);
+                result2 = (IOTHUB_MESSAGE_HANDLE)BASEIMPLEMENTATION::gballoc_malloc(1);
             }
         MOCK_METHOD_END(IOTHUB_MESSAGE_HANDLE, result2);
@@ Expand Down @@