MB-67589: Fix C4456 reported by MSVC...

Declaration of variable hides previous declaration

Change-Id: I86c90ce6d6a0bce1d954d220db417cfb9433dff6
Reviewed-on: https://review.couchbase.org/c/platform/+/237036
Tested-by: Build Bot <build@couchbase.com>
Reviewed-by: Pavlos Georgiou <pavlos.georgiou@couchbase.com>

Author: trondn

CMakeLists.txt

@@ -344,11 +344,19 @@ if (UNIX)
 endif()
 
 if (MEMORY_ALLOCATOR STREQUAL "jemalloc")
-LIST(APPEND PLATFORM_FILES src/je_arena_corelocal_tracker.cc)
-LIST(APPEND PLATFORM_FILES src/je_arena_simple_tracker.cc)
-LIST(APPEND PLATFORM_FILES src/je_arena_malloc.cc)
-LIST(APPEND PLATFORM_FILES src/je_arena_malloc_stats.cc)
-endif()
+    LIST(APPEND PLATFORM_FILES src/je_arena_corelocal_tracker.cc)
+    LIST(APPEND PLATFORM_FILES src/je_arena_simple_tracker.cc)
+    LIST(APPEND PLATFORM_FILES src/je_arena_malloc.cc)
+    LIST(APPEND PLATFORM_FILES src/je_arena_malloc_stats.cc)
+
+    # Exclude je_arena_simple_tracker.cc from unity builds as it
+    # defines a static array which cause compiler warning when other
+    # files in the same unity build also define variables with the same
+    # name.
+    set_source_files_properties(
+            src/je_arena_corelocal_tracker.cc
+            PROPERTIES SKIP_UNITY_BUILD_INCLUSION 1)
+endif ()
 # Always build the system_arena code for simpler concurrent development
 LIST(APPEND PLATFORM_FILES src/system_arena_malloc.cc)
 

include/platform/memory_tracking_allocator.h

@@ -106,9 +106,9 @@ class MemoryTrackingAllocator {
         return baseAllocator.allocate(n);
     }
 
-    void deallocate(value_type* p, std::size_t n) noexcept {
+    void deallocate(value_type* ptr, std::size_t n) noexcept {
         *bytesAllocated -= n * sizeof(T);
-        baseAllocator.deallocate(p, n);
+        baseAllocator.deallocate(ptr, n);
     }
 
     MemoryTrackingAllocator select_on_container_copy_construction() const {

tests/arena_malloc/arena_malloc_test.cc

@@ -143,7 +143,7 @@ TEST_F(ArenaMalloc, DomainGuard) {
 
     void *p1, *p2;
     {
-        cb::UseArenaMallocSecondaryDomain domain;
+        cb::UseArenaMallocSecondaryDomain secondary_domain;
         p1 = cb_malloc(4096);
         EXPECT_EQ(0,
                   cb::ArenaMalloc::getPreciseAllocated(
@@ -173,7 +173,7 @@ TEST_F(ArenaMalloc, DomainGuard) {
                       client, cb::MemoryDomain::Secondary));
 
     {
-        cb::UseArenaMallocSecondaryDomain domain;
+        cb::UseArenaMallocSecondaryDomain secondary_domain;
         cb_free(p1);
         EXPECT_EQ(0,
                   cb::ArenaMalloc::getPreciseAllocated(