|
@@ -35,6 +35,13 @@ bool TypeConverter<SourceType, DestType>::Convert(const SourceType& /*src*/, Des
|
|
|
return false;
|
|
return false;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
+#if defined(RMLUI_PLATFORM_WIN32) && defined(__MINGW32__)
|
|
|
|
|
+#pragma GCC diagnostic push
|
|
|
|
|
+#pragma GCC diagnostic ignored "-Wformat"
|
|
|
|
|
+#pragma GCC diagnostic push
|
|
|
|
|
+#pragma GCC diagnostic ignored "-Wformat-extra-args"
|
|
|
|
|
+#endif
|
|
|
|
|
+
|
|
|
///
|
|
///
|
|
|
/// Full Specialisations
|
|
/// Full Specialisations
|
|
|
///
|
|
///
|
|
@@ -167,13 +174,6 @@ public:
|
|
|
}
|
|
}
|
|
|
};
|
|
};
|
|
|
|
|
|
|
|
-#if defined(RMLUI_PLATFORM_WIN32) && defined(__MINGW32__)
|
|
|
|
|
- #pragma GCC diagnostic push
|
|
|
|
|
- #pragma GCC diagnostic ignored "-Wformat"
|
|
|
|
|
- #pragma GCC diagnostic push
|
|
|
|
|
- #pragma GCC diagnostic ignored "-Wformat-extra-args"
|
|
|
|
|
-#endif
|
|
|
|
|
-
|
|
|
|
|
template<>
|
|
template<>
|
|
|
class TypeConverter< String, int64_t >
|
|
class TypeConverter< String, int64_t >
|
|
|
{
|
|
{
|
|
@@ -194,11 +194,6 @@ public:
|
|
|
}
|
|
}
|
|
|
};
|
|
};
|
|
|
|
|
|
|
|
-#if defined(RMLUI_PLATFORM_WIN32) && defined(__MINGW32__)
|
|
|
|
|
- #pragma GCC diagnostic pop
|
|
|
|
|
- #pragma GCC diagnostic pop
|
|
|
|
|
-#endif
|
|
|
|
|
-
|
|
|
|
|
template<>
|
|
template<>
|
|
|
class TypeConverter< String, bool >
|
|
class TypeConverter< String, bool >
|
|
|
{
|
|
{
|
|
@@ -389,4 +384,9 @@ VECTOR_STRING_CONVERTER(Colourb, byte, 4);
|
|
|
#undef STRING_VECTOR_CONVERTER
|
|
#undef STRING_VECTOR_CONVERTER
|
|
|
#undef VECTOR_STRING_CONVERTER
|
|
#undef VECTOR_STRING_CONVERTER
|
|
|
|
|
|
|
|
|
|
+#if defined(RMLUI_PLATFORM_WIN32) && defined(__MINGW32__)
|
|
|
|
|
+#pragma GCC diagnostic pop
|
|
|
|
|
+#pragma GCC diagnostic pop
|
|
|
|
|
+#endif
|
|
|
|
|
+
|
|
|
} // namespace Rml
|
|
} // namespace Rml
|