From 89f95a20e7a5b4a32a56646f041965d7a510f0f0 Mon Sep 17 00:00:00 2001
From: Billy Robert O'Neal III <bion@microsoft.com>
Date: Thu, 6 Feb 2020 18:19:53 -0800
Subject: [PATCH 1/2] Include missing headers breaking VS2019 version 16.6
 nightly builds

Include the right headers in kdf_sha_crypt.cc:
* <stddef.h> for size_t
* <cstdlib> for std::strtol
* <tuple> for std::tie            (this is the one that broke the build)
* <iterator> for std::distance

Include the right headers in kdf_pbkdf2.cc:
* <stdint.h> for uint8_t
* <cstdlib> for std::strotl
* <tuple> for std::tie            (this is the one that broke the build)
* <iterator> for std::distance

F:\gitP\mysql\mysql-server\router\src\http\src\kdf_sha_crypt.cc(71): error C2039: 'tie': is not a member of 'std' [F:\gitP\mysql\mysql-server\build_amd64\router\src\http\src\http_auth_backend_lib.vcxproj]
F:\gitP\mysql\mysql-server\router\src\http\src\kdf_sha_crypt.cc(71): error C3861: 'tie': identifier not found [F:\gitP\mysql\mysql-server\build_amd64\router\src\http\src\http_auth_backend_lib.vcxproj]
F:\gitP\mysql\mysql-server\router\src\http\src\kdf_pbkdf2.cc(79): error C2039: 'tie': is not a member of 'std' [F:\gitP\mysql\mysql-server\build_amd64\router\src\http\src\http_auth_backend_lib.vcxproj]
F:\gitP\mysql\mysql-server\router\src\http\src\kdf_pbkdf2.cc(79): error C3861: 'tie': identifier not found [F:\gitP\mysql\mysql-server\build_amd64\router\src\http\src\http_auth_backend_lib.vcxproj]
---
 router/src/http/src/kdf_pbkdf2.cc    | 5 +++++
 router/src/http/src/kdf_sha_crypt.cc | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/router/src/http/src/kdf_pbkdf2.cc b/router/src/http/src/kdf_pbkdf2.cc
index 5e29c060915..dcf3a0ebf21 100644
--- a/router/src/http/src/kdf_pbkdf2.cc
+++ b/router/src/http/src/kdf_pbkdf2.cc
@@ -24,11 +24,16 @@
 
 #include "kdf_pbkdf2.h"
 
+#include <stdint.h>
+
 #include <algorithm>
+#include <cstdlib>
 #include <cstring>
+#include <iterator>
 #include <memory>
 #include <stdexcept>
 #include <string>
+#include <tuple>
 #include <vector>
 
 #include <iostream>
diff --git a/router/src/http/src/kdf_sha_crypt.cc b/router/src/http/src/kdf_sha_crypt.cc
index 8b18606dd87..771ed3b6843 100644
--- a/router/src/http/src/kdf_sha_crypt.cc
+++ b/router/src/http/src/kdf_sha_crypt.cc
@@ -24,10 +24,15 @@
 
 #include "kdf_sha_crypt.h"
 
+#include <stddef.h>
+
 #include <algorithm>
+#include <cstdlib>
 #include <cstring>
+#include <iterator>
 #include <memory>
 #include <stdexcept>
+#include <tuple>
 #include <string>
 #include <vector>
 

From c62fcb0ead5213ecbe7601c8a68bb5dba9e4f2ca Mon Sep 17 00:00:00 2001
From: Billy Robert O'Neal III <bion@microsoft.com>
Date: Wed, 19 Feb 2020 11:47:03 -0800
Subject: [PATCH 2/2] In http_auth_method_basic.cc, add:

* <iterator> for std::back_inserter.
* <system_error> for std::make_error_code and std::errc.
---
 router/src/http/src/http_auth_method_basic.cc | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/router/src/http/src/http_auth_method_basic.cc b/router/src/http/src/http_auth_method_basic.cc
index a154bf6f471..9e53c916d9b 100644
--- a/router/src/http/src/http_auth_method_basic.cc
+++ b/router/src/http/src/http_auth_method_basic.cc
@@ -25,6 +25,8 @@
 #include "http_auth_method_basic.h"
 
 #include <algorithm>  // std::find
+#include <iterator>
+#include <system_error>
 #include <string>
 #include <vector>