diff options
author | Jiyoung Yun <jy910.yun@samsung.com> | 2016-12-27 16:46:08 +0900 |
---|---|---|
committer | Jiyoung Yun <jy910.yun@samsung.com> | 2016-12-27 16:46:08 +0900 |
commit | db20f3f1bb8595633a7e16c8900fd401a453a6b5 (patch) | |
tree | e5435159cd1bf0519276363a6fe1663d1721bed3 /src/pal/tests/palsuite/filemapping_memmgt/HeapReAlloc/test2 | |
parent | 4b4aad7217d3292650e77eec2cf4c198ea9c3b4b (diff) | |
download | coreclr-db20f3f1bb8595633a7e16c8900fd401a453a6b5.tar.gz coreclr-db20f3f1bb8595633a7e16c8900fd401a453a6b5.tar.bz2 coreclr-db20f3f1bb8595633a7e16c8900fd401a453a6b5.zip |
Imported Upstream version 1.0.0.9127upstream/1.0.0.9127
Diffstat (limited to 'src/pal/tests/palsuite/filemapping_memmgt/HeapReAlloc/test2')
-rw-r--r-- | src/pal/tests/palsuite/filemapping_memmgt/HeapReAlloc/test2/CMakeLists.txt | 2 | ||||
-rw-r--r-- | src/pal/tests/palsuite/filemapping_memmgt/HeapReAlloc/test2/test2.cpp (renamed from src/pal/tests/palsuite/filemapping_memmgt/HeapReAlloc/test2/test2.c) | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/HeapReAlloc/test2/CMakeLists.txt b/src/pal/tests/palsuite/filemapping_memmgt/HeapReAlloc/test2/CMakeLists.txt index 6f5510387a..a9239354ba 100644 --- a/src/pal/tests/palsuite/filemapping_memmgt/HeapReAlloc/test2/CMakeLists.txt +++ b/src/pal/tests/palsuite/filemapping_memmgt/HeapReAlloc/test2/CMakeLists.txt @@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2) set(CMAKE_INCLUDE_CURRENT_DIR ON) set(SOURCES - test2.c + test2.cpp ) add_executable(paltest_heaprealloc_test2 diff --git a/src/pal/tests/palsuite/filemapping_memmgt/HeapReAlloc/test2/test2.c b/src/pal/tests/palsuite/filemapping_memmgt/HeapReAlloc/test2/test2.cpp index 13e789f901..a7e3b2a055 100644 --- a/src/pal/tests/palsuite/filemapping_memmgt/HeapReAlloc/test2/test2.c +++ b/src/pal/tests/palsuite/filemapping_memmgt/HeapReAlloc/test2/test2.cpp @@ -38,7 +38,7 @@ int __cdecl main(int argc, char *argv[]) } /* Allocate 200 bytes on the heap */ - if((TheMemory = HeapAlloc(TheHeap, 0, 200)) == NULL) + if((TheMemory = (char*)HeapAlloc(TheHeap, 0, 200)) == NULL) { Fail("ERROR: HeapAlloc returned NULL when it was called. " "GetLastError() returned %d.",GetLastError()); @@ -51,7 +51,7 @@ int __cdecl main(int argc, char *argv[]) memset(TheMemory+100, 'Z', 100); /* Reallocate the memory to 100 bytes */ - ReAllocMemory = HeapReAlloc(TheHeap, 0, TheMemory, 100); + ReAllocMemory = (char*)HeapReAlloc(TheHeap, 0, TheMemory, 100); if(ReAllocMemory == NULL) { |