Use de::max explicitly instead of max
authorMichael Worcester <michael.worcester@imgtec.com>
Wed, 16 Dec 2015 18:58:05 +0000 (18:58 +0000)
committerMichael Worcester <michael.worcester@imgtec.com>
Wed, 16 Dec 2015 18:58:05 +0000 (18:58 +0000)
external/vulkancts/modules/vulkan/api/vktApiDeviceInitializationTests.cpp

index d1b540c..0421ff6 100644 (file)
@@ -495,7 +495,7 @@ deUint32 getGlobalMaxQueueCount(const vector<VkQueueFamilyProperties>& queueFami
 
        for (deUint32 queueFamilyNdx = 0; queueFamilyNdx < (deUint32)queueFamilyProperties.size(); queueFamilyNdx++)
        {
-               maxQueueCount = max(maxQueueCount, queueFamilyProperties[queueFamilyNdx].queueCount);
+               maxQueueCount = de::max(maxQueueCount, queueFamilyProperties[queueFamilyNdx].queueCount);
        }
 
        return maxQueueCount;