Fix merge

2020-02-25 20:22:46 +01:00
parent cb66dddd45
commit 7bbba14ba0
10 changed files with 97 additions and 26 deletions
--- a/include/Nazara/VulkanRenderer/Wrapper/Device.inl
+++ b/include/Nazara/VulkanRenderer/Wrapper/Device.inl
@@ -68,12 +68,12 @@ namespace Nz
 			return m_physicalDevice;
 		}

-		inline bool Device::IsExtensionLoaded(const String& extensionName)
+		inline bool Device::IsExtensionLoaded(const std::string& extensionName)
 		{
 			return m_loadedExtensions.count(extensionName) > 0;
 		}

-		inline bool Device::IsLayerLoaded(const String& layerName)
+		inline bool Device::IsLayerLoaded(const std::string& layerName)
 		{
 			return m_loadedLayers.count(layerName) > 0;
 		}