From 5bff1601d98f15447211078231381376b71ce634 Mon Sep 17 00:00:00 2001
From: Jason Lokerson <cmercenary@gmail.com>
Date: Sun, 28 Aug 2016 13:29:44 -0700
Subject: [PATCH 1/2] Fix msvc14 64-bit release mode linker error

We declare but never explicitly define the void `init` blocks.  Somehow this still works on every other build configuration, but not VC2015 release mode.  Fix this.
---
 src/autowiring/auto_id.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/autowiring/auto_id.cpp b/src/autowiring/auto_id.cpp
index 3d8bdef58..ad65793a7 100644
--- a/src/autowiring/auto_id.cpp
+++ b/src/autowiring/auto_id.cpp
@@ -17,6 +17,9 @@ const auto_id_block auto_id_t<void>::s_block{
   nullptr
 };
 
+const auto_id_t_init<void, true> auto_id_t_init<void, true>::init;
+const auto_id_t_init<void, false> auto_id_t_init<void, false>::init;
+
 int autowiring::CreateIndex(void) {
   return s_index++;
 }

From 069824bec728deb5433bc6a963264fd7a128f023 Mon Sep 17 00:00:00 2001
From: Jason Lokerson <cmercenary@gmail.com>
Date: Sun, 28 Aug 2016 13:40:26 -0700
Subject: [PATCH 2/2] Use initializer syntax to satisfy clang

---
 src/autowiring/auto_id.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/autowiring/auto_id.cpp b/src/autowiring/auto_id.cpp
index ad65793a7..f83822fa3 100644
--- a/src/autowiring/auto_id.cpp
+++ b/src/autowiring/auto_id.cpp
@@ -17,8 +17,8 @@ const auto_id_block auto_id_t<void>::s_block{
   nullptr
 };
 
-const auto_id_t_init<void, true> auto_id_t_init<void, true>::init;
-const auto_id_t_init<void, false> auto_id_t_init<void, false>::init;
+const auto_id_t_init<void, true> auto_id_t_init<void, true>::init{};
+const auto_id_t_init<void, false> auto_id_t_init<void, false>::init{};
 
 int autowiring::CreateIndex(void) {
   return s_index++;