Fix/suppress MSVC warnings

2016-03-19 06:39:33 -07:00
parent 63d7f3d116
commit 9ffe98c00e
4 changed files with 7 additions and 3 deletions
@@ -487,6 +487,9 @@ struct LocaleMock {
 } *LocaleMock::instance;

 #ifdef _MSC_VER
+# pragma warning(push)
+# pragma warning(disable: 4273)
+
 _locale_t _create_locale(int category, const char *locale) {
  return LocaleMock::instance->newlocale(category, locale, 0);
 }
@@ -498,6 +501,7 @@ void _free_locale(_locale_t locale) {
 double _strtod_l(const char *nptr, char **endptr, _locale_t locale) {
  return LocaleMock::instance->strtod_l(nptr, endptr, locale);
 }
+# pragma warning(pop)
 #endif

 LocaleType newlocale(int category_mask, const char *locale, LocaleType base) {