diff options
| author | Jason Evans <jasone@canonware.com> | 2016-12-04 06:48:43 (GMT) |
|---|---|---|
| committer | Jason Evans <jasone@canonware.com> | 2016-12-04 06:48:43 (GMT) |
| commit | f1f76357313e7dcad7262f17a48ff0a2e005fcdc (patch) | |
| tree | 826e5a42621cbd8abc9e7473437f223faccc2b0c /msvc/projects/vc2015/test_threads/test_threads.cpp | |
| parent | 0110fa8451af905affd77c3bea0d545fee2251b2 (diff) | |
| parent | 2d1bb8980fff829c58dabbf122224f577879a32c (diff) | |
| download | jemalloc-4.4.0.zip jemalloc-4.4.0.tar.gz jemalloc-4.4.0.tar.bz2 | |
Merge branch 'rc-4.4.0'4.4.0
Diffstat (limited to 'msvc/projects/vc2015/test_threads/test_threads.cpp')
| -rwxr-xr-x[-rw-r--r--] | msvc/projects/vc2015/test_threads/test_threads.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/msvc/projects/vc2015/test_threads/test_threads.cpp b/msvc/projects/vc2015/test_threads/test_threads.cpp index c8cb7d6..a3d1a79 100644..100755 --- a/msvc/projects/vc2015/test_threads/test_threads.cpp +++ b/msvc/projects/vc2015/test_threads/test_threads.cpp @@ -21,7 +21,7 @@ int test_threads() je_malloc_conf = "narenas:3"; int narenas = 0; size_t sz = sizeof(narenas); - je_mallctl("opt.narenas", &narenas, &sz, NULL, 0); + je_mallctl("opt.narenas", (void *)&narenas, &sz, NULL, 0); if (narenas != 3) { printf("Error: unexpected number of arenas: %d\n", narenas); return 1; @@ -33,7 +33,7 @@ int test_threads() je_malloc_stats_print(NULL, NULL, NULL); size_t allocated1; size_t sz1 = sizeof(allocated1); - je_mallctl("stats.active", &allocated1, &sz1, NULL, 0); + je_mallctl("stats.active", (void *)&allocated1, &sz1, NULL, 0); printf("\nPress Enter to start threads...\n"); getchar(); printf("Starting %d threads x %d x %d iterations...\n", numThreads, numIter1, numIter2); @@ -78,7 +78,7 @@ int test_threads() } je_malloc_stats_print(NULL, NULL, NULL); size_t allocated2; - je_mallctl("stats.active", &allocated2, &sz1, NULL, 0); + je_mallctl("stats.active", (void *)&allocated2, &sz1, NULL, 0); size_t leaked = allocated2 - allocated1; printf("\nDone. Leaked: %zd bytes\n", leaked); bool failed = leaked > 65536; // in case C++ runtime allocated something (e.g. iostream locale or facet) |
