From 873a4696860ff73461004e1df6428fc5222baad0 Mon Sep 17 00:00:00 2001
From: John Emmas <johne53@tiscali.co.uk>
Date: Wed, 19 Apr 2017 17:22:44 +0100
Subject: [PATCH] Changes needed for building Tim's new 'string_convert' stuff
 with MSVC (libardour)

---
 libs/ardour/MSVClibardour/ardour.vcproj | 8 ++++++++
 libs/ardour/ardour/rc_configuration.h   | 1 +
 libs/ardour/ardour/region.h             | 1 +
 libs/ardour/ardour/types_convert.h      | 4 ++++
 4 files changed, 14 insertions(+)

diff --git a/libs/ardour/MSVClibardour/ardour.vcproj b/libs/ardour/MSVClibardour/ardour.vcproj
index 89653f8ec1..292e66d63b 100644
--- a/libs/ardour/MSVClibardour/ardour.vcproj
+++ b/libs/ardour/MSVClibardour/ardour.vcproj
@@ -1705,6 +1705,10 @@
 				RelativePath="..\ardour\event_type_map.h"
 				>
 			</File>
+			<File
+				RelativePath="..\ardour\evoral_types_convert.h"
+				>
+			</File>
 			<File
 				RelativePath="..\ardour\export_analysis.h"
 				>
@@ -2477,6 +2481,10 @@
 				RelativePath="..\ardour\types.h"
 				>
 			</File>
+			<File
+				RelativePath="..\ardour\types_convert.h"
+				>
+			</File>
 			<File
 				RelativePath="..\ardour\unknown_processor.h"
 				>
diff --git a/libs/ardour/ardour/rc_configuration.h b/libs/ardour/ardour/rc_configuration.h
index 4f1bac303a..a644d76250 100644
--- a/libs/ardour/ardour/rc_configuration.h
+++ b/libs/ardour/ardour/rc_configuration.h
@@ -26,6 +26,7 @@
 #include "ardour/libardour_visibility.h"
 #include "ardour/types.h"
 #include "ardour/utils.h"
+#include "ardour/types_convert.h"
 
 #include "pbd/configuration.h"
 
diff --git a/libs/ardour/ardour/region.h b/libs/ardour/ardour/region.h
index f51f54b00c..33c381df58 100644
--- a/libs/ardour/ardour/region.h
+++ b/libs/ardour/ardour/region.h
@@ -34,6 +34,7 @@
 #include "ardour/readable.h"
 #include "ardour/session_object.h"
 #include "ardour/trimmable.h"
+#include "ardour/types_convert.h"
 
 class XMLNode;
 
diff --git a/libs/ardour/ardour/types_convert.h b/libs/ardour/ardour/types_convert.h
index dd47eb46f0..8e9c785a96 100644
--- a/libs/ardour/ardour/types_convert.h
+++ b/libs/ardour/ardour/types_convert.h
@@ -20,6 +20,10 @@
 #ifndef ARDOUR_TYPES_CONVERT_H
 #define ARDOUR_TYPES_CONVERT_H
 
+#ifdef COMPILER_MSVC
+#pragma warning(disable:4101)
+#endif
+
 #include "pbd/enum_convert.h"
 
 #include "ardour/types.h"