w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2026-06-05 15:34:39 -04:00
Code Issues Packages Projects Releases Wiki Activity

Squashed 'boost/' changes from d9443bc48..c27aa31f0

Browse Source 
c27aa31f0 Updated Boost to v1.70.0 including iterator range math numeric crc circular_buffer multi_index intrusive

git-subtree-dir: boost
git-subtree-split: c27aa31f06ebf1a91b3fa3ae9df9b5efdf14ec9f
This commit is contained in:
Bill Somerville
2019-07-02 23:38:24 +01:00
parent edd0930758
commit d361e123c6
6021 changed files with 118782 additions and 872011 deletions
Download Patch File Download Diff File Expand all files Collapse all files
boost/python/suite/indexing/detail/indexing_suite_detail.hpp
+3 -3
View File
@@ -11,7 +11,7 @@
# include <boost/get_pointer.hpp>
# include <boost/detail/binary_search.hpp>
# include <boost/numeric/conversion/cast.hpp>
# include <boost/type_traits/is_pointer.hpp>
# include <boost/python/detail/type_traits.hpp>
# include <vector>
# include <map>
#include <iostream>
@@ -465,14 +465,14 @@ namespace boost { namespace python { namespace detail {
template <class DataType>
static object
base_get_item_helper(DataType const& p, mpl::true_)
base_get_item_helper(DataType const& p, detail::true_)
{
return object(ptr(p));
}
template <class DataType>
static object
base_get_item_helper(DataType const& x, mpl::false_)
base_get_item_helper(DataType const& x, detail::false_)
{
return object(x);
}
boost/python/suite/indexing/indexing_suite.hpp
+5 -5
View File
@@ -14,7 +14,7 @@
# include <boost/python/iterator.hpp>
# include <boost/mpl/or.hpp>
# include <boost/mpl/not.hpp>
# include <boost/type_traits/is_same.hpp>
# include <boost/python/detail/type_traits.hpp>
namespace boost { namespace python {
@@ -122,10 +122,10 @@ namespace boost { namespace python {
mpl::bool_<NoProxy>
, mpl::not_<is_class<Data> >
, typename mpl::or_<
is_same<Data, std::string>
, is_same<Data, std::complex<float> >
, is_same<Data, std::complex<double> >
, is_same<Data, std::complex<long double> > >::type>
detail::is_same<Data, std::string>
, detail::is_same<Data, std::complex<float> >
, detail::is_same<Data, std::complex<double> >
, detail::is_same<Data, std::complex<long double> > >::type>
no_proxy;
typedef detail::container_element<Container, Index, DerivedPolicies>