From de5821703f9e28a6dfc8d858364e97441594bfa3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20S=C3=BC=C3=9Fenbach?= <asuessenbach@nvidia.com>
Date: Tue, 24 Oct 2023 18:27:35 +0200
Subject: [PATCH] Ignore warnings in some tests; fix ambiguity in ArrayWrapper
 test (#1712)

---
 tests/ArrayProxy/ArrayProxy.cpp                     |  2 +-
 .../ArrayProxyNoTemporaries.cpp                     |  8 ++++----
 tests/ArrayWrapper/ArrayWrapper.cpp                 |  6 ++++--
 tests/UniqueHandle/UniqueHandle.cpp                 | 13 +++++++++++++
 4 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/tests/ArrayProxy/ArrayProxy.cpp b/tests/ArrayProxy/ArrayProxy.cpp
index 31af182..8db7f1b 100644
--- a/tests/ArrayProxy/ArrayProxy.cpp
+++ b/tests/ArrayProxy/ArrayProxy.cpp
@@ -22,7 +22,7 @@
 #elif defined( __GNUC__ )
 #  pragma GCC diagnostic ignored "-Wunused-but-set-variable"
 #else
-// unknow compiler... just ignore the warnings for yourselves ;)
+// unknown compiler... just ignore the warnings for yourselves ;)
 #endif
 
 #include <iostream>
diff --git a/tests/ArrayProxyNoTemporaries/ArrayProxyNoTemporaries.cpp b/tests/ArrayProxyNoTemporaries/ArrayProxyNoTemporaries.cpp
index d1bf1da..463b156 100644
--- a/tests/ArrayProxyNoTemporaries/ArrayProxyNoTemporaries.cpp
+++ b/tests/ArrayProxyNoTemporaries/ArrayProxyNoTemporaries.cpp
@@ -17,12 +17,12 @@
 
 #if defined( _MSC_VER )
 // no need to ignore any warnings with MSVC
+#elif defined( __clang__ )
+#  pragma clang diagnostic ignored "-Wunused-variable"
 #elif defined( __GNUC__ )
-#  if ( 9 <= __GNUC__ )
-#    pragma GCC diagnostic ignored "-Winit-list-lifetime"
-#  endif
+#  pragma GCC diagnostic ignored "-Wunused-but-set-variable"
 #else
-// unknow compiler... just ignore the warnings for yourselves ;)
+// unknown compiler... just ignore the warnings for yourselves ;)
 #endif
 
 #include <iostream>
diff --git a/tests/ArrayWrapper/ArrayWrapper.cpp b/tests/ArrayWrapper/ArrayWrapper.cpp
index 2c48e88..2a3963c 100644
--- a/tests/ArrayWrapper/ArrayWrapper.cpp
+++ b/tests/ArrayWrapper/ArrayWrapper.cpp
@@ -33,7 +33,9 @@ int main( int /*argc*/, char ** /*argv*/ )
 
   // s1 = aw1;  // 'operator =' is ambiguous
 
-  vk::ArrayWrapper1D<char, 20> aw2( "foobah" );
+  std::string foobah = "foobah";
+
+  vk::ArrayWrapper1D<char, 20> aw2( foobah );
   f( aw2 );
 
   vk::ArrayWrapper1D<char, 5> aw3( { 'f', 'o', 'o', 'b', 'a', 'h' } );
@@ -41,7 +43,7 @@ int main( int /*argc*/, char ** /*argv*/ )
   assert( s3.length() == 5 );
   std::cout << "<" << s3 << ">" << std::endl;
 
-  vk::ArrayWrapper1D<char, 5> aw4( "foobah" );
+  vk::ArrayWrapper1D<char, 5> aw4( foobah );
   std::string                 s4 = aw4;
   assert( s4.length() == 5 );
 
diff --git a/tests/UniqueHandle/UniqueHandle.cpp b/tests/UniqueHandle/UniqueHandle.cpp
index c8de073..381086a 100644
--- a/tests/UniqueHandle/UniqueHandle.cpp
+++ b/tests/UniqueHandle/UniqueHandle.cpp
@@ -27,6 +27,19 @@ static std::string EngineName = "Vulkan.hpp";
 template <typename T>
 class MyAllocator : public std::allocator<T>
 {
+public:
+  MyAllocator() = default;
+
+  template <class U>
+  MyAllocator( const MyAllocator<U> & /*unused*/ )
+  {
+  }
+
+  template <class U>
+  struct rebind
+  {
+    using other = MyAllocator<U>;
+  };
 };
 
 vk::UniqueDescriptorSetLayout createDescriptorSetLayoutUnique( vk::Device const &                                                                  device,