Drop boost-1.57.0-mpl-print.patch patch that doesn't work
This patch is supposed to make boost::mpl::print issue a warning with GCC, but actually it prevents it from warning, whereas the upstream code does warn.
This commit is contained in:
parent
d5a194094a
commit
eefba79672
@ -1,31 +0,0 @@
|
||||
diff -up boost_1_57_0/boost/mpl/print.hpp\~ boost_1_57_0/boost/mpl/print.hpp
|
||||
--- boost_1_57_0/boost/mpl/print.hpp~ 2014-07-09 23:12:31.000000000 +0200
|
||||
+++ boost_1_57_0/boost/mpl/print.hpp 2015-01-20 12:44:59.621400948 +0100
|
||||
@@ -52,16 +52,15 @@ struct print
|
||||
enum { n = sizeof(T) + -1 };
|
||||
#elif defined(__MWERKS__)
|
||||
void f(int);
|
||||
-#else
|
||||
- enum {
|
||||
- n =
|
||||
-# if defined(__EDG_VERSION__)
|
||||
- aux::dependent_unsigned<T>::value > -1
|
||||
-# else
|
||||
- sizeof(T) > -1
|
||||
-# endif
|
||||
- };
|
||||
-#endif
|
||||
+#elif defined(__EDG_VERSION__)
|
||||
+ enum { n = aux::dependent_unsigned<T>::value > -1 };
|
||||
+#elif defined(BOOST_GCC)
|
||||
+ enum { n1 };
|
||||
+ enum { n2 };
|
||||
+ enum { n = n1 != n2 };
|
||||
+#else
|
||||
+ enum { n = sizeof(T) > -1 };
|
||||
+#endif
|
||||
};
|
||||
|
||||
#if defined(BOOST_MSVC)
|
||||
|
||||
Diff finished. Tue Jan 20 12:45:03 2015
|
@ -44,7 +44,7 @@ Summary: The free peer-reviewed portable C++ source libraries
|
||||
Version: 1.69.0
|
||||
%global version_enc 1_69_0
|
||||
%global version_suffix 169
|
||||
Release: 15%{?dist}
|
||||
Release: 16%{?dist}
|
||||
License: Boost and MIT and Python
|
||||
|
||||
%global toplev_dirname %{real_name}_%{version_enc}
|
||||
@ -121,9 +121,6 @@ Patch5: boost-1.48.0-add-bjam-man-page.patch
|
||||
# https://svn.boost.org/trac/boost/ticket/6701
|
||||
Patch15: boost-1.58.0-pool.patch
|
||||
|
||||
# https://svn.boost.org/trac/boost/ticket/5637
|
||||
Patch25: boost-1.57.0-mpl-print.patch
|
||||
|
||||
# https://svn.boost.org/trac/boost/ticket/9038
|
||||
Patch51: boost-1.58.0-pool-test_linking.patch
|
||||
|
||||
@ -644,7 +641,6 @@ find ./boost -name '*.hpp' -perm /111 | xargs chmod a-x
|
||||
%patch4 -p1
|
||||
%patch5 -p1
|
||||
%patch15 -p0
|
||||
%patch25 -p1
|
||||
%patch51 -p1
|
||||
%patch61 -p1
|
||||
%patch62 -p1
|
||||
@ -1273,6 +1269,9 @@ fi
|
||||
%{_mandir}/man1/bjam.1*
|
||||
|
||||
%changelog
|
||||
* Thu Apr 02 2020 Jonathan Wakely <jwakely@redhat.com> - 1.69.0-16
|
||||
- Drop boost-1.57.0-mpl-print.patch patch that doesn't work
|
||||
|
||||
* Mon Mar 30 2020 Jonathan Wakely <jwakely@redhat.com> - 1.69.0-15
|
||||
- Patch Boost.Format for C++20 compatibility with GCC 10 (#1818723)
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user