Scope ANGLE_UNUSED_VARIABLE.

src/common/bitset_utils_unittest.cpp

@@ -55,7 +55,7 @@ TEST_F(BitSetIteratorTest, EmptySet)
     for (size_t bit : mStateBits)
     {
         sawBit = true;
-        UNUSED_VARIABLE(bit);
+        ANGLE_UNUSED_VARIABLE(bit);
     }
     EXPECT_FALSE(sawBit);
 }

src/common/debug.h

@@ -259,7 +259,7 @@ std::ostream &FmtHexInt(std::ostream &os, T value)
 #define UNREACHABLE_IS_NORETURN 0
 #endif  // defined(ANGLE_ENABLE_ASSERTS)
 
-#define UNUSED_VARIABLE(variable) ((void)variable)
+#define ANGLE_UNUSED_VARIABLE(variable) (static_cast<void>(variable))
 
 // A macro to indicate unimplemented functionality
 #ifndef NOASSERT_UNIMPLEMENTED

src/libANGLE/Context.cpp

@@ -297,8 +297,8 @@ Context::Context(rx::EGLImplFactory *implFactory,
       mZeroFilledBuffer(1000u)
 {
     // Needed to solve a Clang warning of unused variables.
-    UNUSED_VARIABLE(mSavedArgsType);
-    UNUSED_VARIABLE(mParamsBuffer);
+    ANGLE_UNUSED_VARIABLE(mSavedArgsType);
+    ANGLE_UNUSED_VARIABLE(mParamsBuffer);
 
     mImplementation->setMemoryProgramCache(memoryProgramCache);
 

src/libANGLE/renderer/d3d/d3d11/Renderer11.cpp

@@ -1259,7 +1259,7 @@ NativeWindowD3D *Renderer11::createNativeWindow(EGLNativeWindowType window,
                                                 const egl::AttributeMap &attribs) const
 {
 #ifdef ANGLE_ENABLE_WINDOWS_STORE
-    UNUSED_VARIABLE(attribs);
+    ANGLE_UNUSED_VARIABLE(attribs);
     return new NativeWindow11WinRT(window, config->alphaSize > 0);
 #else
     return new NativeWindow11Win32(

src/libANGLE/renderer/vulkan/SurfaceVk.cpp

@@ -239,7 +239,7 @@ vk::Error WindowSurfaceVk::initializeImpl(RendererVk *renderer)
 
     uint32_t presentQueue = 0;
     ANGLE_TRY_RESULT(renderer->selectPresentQueueForSurface(mSurface), presentQueue);
-    UNUSED_VARIABLE(presentQueue);
+    ANGLE_UNUSED_VARIABLE(presentQueue);
 
     const VkPhysicalDevice &physicalDevice = renderer->getPhysicalDevice();
 

src/libANGLE/renderer/vulkan/vk_cache_utils.cpp

@@ -246,7 +246,7 @@ Error InitializeRenderPassFromDesc(VkDevice device,
 // RenderPassDesc implementation.
 RenderPassDesc::RenderPassDesc()
 {
-    UNUSED_VARIABLE(mPadding);
+    ANGLE_UNUSED_VARIABLE(mPadding);
     memset(this, 0, sizeof(RenderPassDesc));
 }
 

src/tests/perf_tests/BitSetIteratorPerf.cpp

@@ -42,7 +42,7 @@ void BitSetIteratorPerfTest<T>::step()
 
     for (size_t bit : mBits)
     {
-        UNUSED_VARIABLE(bit);
+        ANGLE_UNUSED_VARIABLE(bit);
     }
 
     mBits.reset();