Merge branch 'master' into dev/jomaples/LWG3255

This commit is contained in:
Jordan Maples committed 2020-04-09 09:53:45 -07:00
commit f85166aa8b
2 files changed
+3 -3

No files matched your search

+2 -2
View File
@@ -57,7 +57,7 @@
#endif // _MSC_VER < 1910
#endif // _MSC_VER
#if __clang__ || __GNUC__
#if defined(__GNUC__) || defined(__clang__)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
#endif
@@ -2266,7 +2266,7 @@ general_span_iterator<Span> operator+(typename general_span_iterator<Span>::diff
#pragma GCC diagnostic pop
#endif // __GNUC__ > 6
#if __clang__ || __GNUC__
#if defined(__GNUC__) || defined(__clang__)
#pragma GCC diagnostic pop
#endif