restore fixes for MS build

PeterPetrik · wonder-sk · commit f54a23e3c4e0 · 2018-07-19T11:30:52.000+02:00
diff --git a/external/mdal/frmts/mdal_hdf5.hpp b/external/mdal/frmts/mdal_hdf5.hpp
@@ -27,7 +27,7 @@ struct HdfString
   char data [HDF_MAX_NAME];
 };
 
-template <int TYPE> inline void hdfClose( hid_t id ) { assert( false ); }
+template <int TYPE> inline void hdfClose( hid_t id ) { MDAL_UNUSED( id ); assert( false ); }
 template <> inline void hdfClose<H5I_FILE>( hid_t id ) { H5Fclose( id ); }
 template <> inline void hdfClose<H5I_GROUP>( hid_t id ) { H5Gclose( id ); }
 template <> inline void hdfClose<H5I_DATASET>( hid_t id ) { H5Dclose( id ); }
diff --git a/external/mdal/mdal_loader.cpp b/external/mdal/mdal_loader.cpp
@@ -8,6 +8,7 @@
 #include "frmts/mdal_2dm.hpp"
 #include "frmts/mdal_ascii_dat.hpp"
 #include "frmts/mdal_binary_dat.hpp"
+#include "mdal_utils.hpp"
 
 #ifdef HAVE_HDF5
 #include "frmts/mdal_xmdf.hpp"
diff --git a/external/mdal/mdal_utils.cpp b/external/mdal/mdal_utils.cpp
@@ -4,6 +4,7 @@
 */
 
 #include "mdal_utils.hpp"
+#include <string>
 #include <fstream>
 #include <iostream>
 #include <algorithm>
@@ -101,7 +102,14 @@ bool MDAL::contains( const std::string &str, const std::string &substr, Contains
     auto it = std::search(
                 str.begin(), str.end(),
                 substr.begin(),   substr.end(),
-    []( char ch1, char ch2 ) { return std::toupper( ch1 ) == std::toupper( ch2 ); }
+                []( char ch1, char ch2 )
+    {
+#ifdef _MSC_VER
+      return toupper( ch1 ) == toupper( ch2 );
+#else
+      return std::toupper( ch1 ) == std::toupper( ch2 );
+#endif
+    }
               );
     return ( it != str.end() );
   }
diff --git a/external/mdal/mdal_utils.hpp b/external/mdal/mdal_utils.hpp
@@ -13,6 +13,9 @@
 
 #include "mdal_data_model.hpp"
 
+// avoid unused variable warnings
+#define MDAL_UNUSED(x) (void)x;
+
 namespace MDAL
 {
   // numbers

Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,9 @@`
`13`	`13`
`14`	`14`	`#include "mdal_data_model.hpp"`
`15`	`15`
	`16`	`+// avoid unused variable warnings`
	`17`	`+#define MDAL_UNUSED(x) (void)x;`
	`18`	`+`
`16`	`19`	`namespace MDAL`
`17`	`20`	`{`
`18`	`21`	`// numbers`