From a48ab556f35f7d97ddc1df4fde29bbad54a93437 Mon Sep 17 00:00:00 2001
From: baldurk <baldurk@baldurk.org>
Date: Wed, 19 Aug 2020 19:18:37 +0100
Subject: [PATCH] Fix compile errors

---
 renderdoc/api/replay/rdcflatmap.h      | 3 +++
 renderdoc/api/replay/rdcpair.h         | 5 ++++-
 renderdoc/driver/vulkan/vk_manager.h   | 2 +-
 renderdoc/replay/basic_types_tests.cpp | 4 ----
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/renderdoc/api/replay/rdcflatmap.h b/renderdoc/api/replay/rdcflatmap.h
index e9dff892f..1a92019c8 100644
--- a/renderdoc/api/replay/rdcflatmap.h
+++ b/renderdoc/api/replay/rdcflatmap.h
@@ -1,6 +1,9 @@
 #pragma once
 
+#include <algorithm>
+#include "apidefs.h"
 #include "rdcarray.h"
+#include "rdcpair.h"
 
 // this is a container with a key-value interface but no strong ordering guarantee.
 // The storage is an array of K,V pairs, which are unsorted below a given threshold. As a result
diff --git a/renderdoc/api/replay/rdcpair.h b/renderdoc/api/replay/rdcpair.h
index 68eb71f51..e3c8fc822 100644
--- a/renderdoc/api/replay/rdcpair.h
+++ b/renderdoc/api/replay/rdcpair.h
@@ -37,7 +37,10 @@ struct rdcpair
   rdcpair(const A &a, const B &b) : first(a), second(b) {}
   rdcpair() = default;
   rdcpair(const rdcpair<A, B> &o) = default;
-  rdcpair(rdcpair<A, B> &&o) : first(std::move(o.first)), second(std::move(o.second)) {}
+  rdcpair(rdcpair<typename std::decay<A>::type, typename std::decay<B>::type> &&o)
+      : first(std::move(o.first)), second(std::move(o.second))
+  {
+  }
   rdcpair(typename std::decay<A>::type &&a, typename std::decay<B>::type &&b)
       : first(std::move(a)), second(std::move(b))
   {
diff --git a/renderdoc/driver/vulkan/vk_manager.h b/renderdoc/driver/vulkan/vk_manager.h
index c8b264a03..e72ddcfa3 100644
--- a/renderdoc/driver/vulkan/vk_manager.h
+++ b/renderdoc/driver/vulkan/vk_manager.h
@@ -333,7 +333,7 @@ public:
 
     typename UnwrapHelper<realtype>::Outer *wrapped =
         (typename UnwrapHelper<realtype>::Outer *)record->Resource;
-    wrapped->real = obj;
+    wrapped->real = ToTypedHandle(obj).real;
 
     obj = realtype((uint64_t)wrapped);
 
diff --git a/renderdoc/replay/basic_types_tests.cpp b/renderdoc/replay/basic_types_tests.cpp
index 90055c22d..b1673b4f6 100644
--- a/renderdoc/replay/basic_types_tests.cpp
+++ b/renderdoc/replay/basic_types_tests.cpp
@@ -52,25 +52,21 @@ struct ConstructorCounter
 
   ConstructorCounter()
   {
-    RDCASSERT(value != -9999);
     value = 0;
     Atomic::Inc32(&constructor);
   }
   ConstructorCounter(int v)
   {
-    RDCASSERT(value != -9999);
     value = v;
     Atomic::Inc32(&valueConstructor);
   }
   ConstructorCounter(const ConstructorCounter &other)
   {
-    RDCASSERT(value != -9999);
     value = other.value;
     Atomic::Inc32(&copyConstructor);
   }
   ConstructorCounter(ConstructorCounter &&other)
   {
-    RDCASSERT(value != -9999);
     value = other.value;
     other.value = -9999;
     Atomic::Inc32(&moveConstructor);