Changes needed for building Tim's new 'string_convert' stuff with MSVC (libardour)

diff --git a/libs/ardour/MSVClibardour/ardour.vcproj b/libs/ardour/MSVClibardour/ardour.vcproj
index 89653f8ec1cecaef32792fd328530bc1c625ab70..292e66d63b5084acddc2cbfae7ad7b68e1a32d96 100644 (file)
--- 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 4f1bac303a0ae8bca781e82db5b61fe3e03062e7..a644d76250002cf8897f866c59d9e3afa1b7b403 100644 (file)
--- 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 f51f54b00cbf2651a5a383def4fcf7cae4a82cdb..33c381df5886f25fbefafe00735b5fda9f96f39c 100644 (file)
--- 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 dd47eb46f038fbb1136cc412aadc1d04ceb03b94..8e9c785a96bb60307e7ebc6818a07f6ce2f4b824 100644 (file)
--- 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"