Skip to content

Commit

Permalink
std::span -> gsl::span
Browse files Browse the repository at this point in the history
  • Loading branch information
Dan Smith authored and Dan Smith committed Jan 16, 2021
1 parent 9e21803 commit c10f233
Show file tree
Hide file tree
Showing 2 changed files with 61 additions and 61 deletions.
68 changes: 34 additions & 34 deletions six/modules/python/cphd/source/generated/cphd_wrap.cxx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44686,7 +44686,7 @@ SWIGINTERN PyObject *_wrap_SupportBlock_read__SWIG_0(PyObject *SWIGUNUSEDPARM(se
cphd::SupportBlock *arg1 = (cphd::SupportBlock *) 0 ;
std::string *arg2 = 0 ;
size_t arg3 ;
std::span< std::byte > *arg4 = 0 ;
gsl::span< std::byte > *arg4 = 0 ;
void *argp1 = 0 ;
int res1 = 0 ;
int res2 = SWIG_OLDOBJ ;
Expand Down Expand Up @@ -44723,16 +44723,16 @@ SWIGINTERN PyObject *_wrap_SupportBlock_read__SWIG_0(PyObject *SWIGUNUSEDPARM(se
arg3 = static_cast< size_t >(val3);
res4 = SWIG_ConvertPtr(obj3, &argp4, SWIGTYPE_p_mem__BufferViewT_unsigned_char_t, 0 | 0);
if (!SWIG_IsOK(res4)) {
SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "SupportBlock_read" "', argument " "4"" of type '" "std::span< std::byte > const &""'");
SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "SupportBlock_read" "', argument " "4"" of type '" "gsl::span< std::byte > const &""'");
}
if (!argp4) {
SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "SupportBlock_read" "', argument " "4"" of type '" "std::span< std::byte > const &""'");
SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "SupportBlock_read" "', argument " "4"" of type '" "gsl::span< std::byte > const &""'");
}
arg4 = reinterpret_cast< std::span< std::byte > * >(argp4);
arg4 = reinterpret_cast< gsl::span< std::byte > * >(argp4);
{
try
{
((cphd::SupportBlock const *)arg1)->read((std::string const &)*arg2,arg3,(std::span< std::byte > const &)*arg4);
((cphd::SupportBlock const *)arg1)->read((std::string const &)*arg2,arg3,(gsl::span< std::byte > const &)*arg4);
}
catch (const std::exception& e)
{
Expand Down Expand Up @@ -44920,7 +44920,7 @@ SWIGINTERN PyObject *_wrap_SupportBlock_read(PyObject *self, PyObject *args) {
fail:
SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'SupportBlock_read'.\n"
" Possible C/C++ prototypes are:\n"
" cphd::SupportBlock::read(std::string const &,size_t,std::span< std::byte > const &) const\n"
" cphd::SupportBlock::read(std::string const &,size_t,gsl::span< std::byte > const &) const\n"
" cphd::SupportBlock::read(std::string const &,size_t,std::unique_ptr< std::byte[] > &) const\n");
return 0;
}
Expand Down Expand Up @@ -80756,7 +80756,7 @@ SWIGINTERN PyObject *_wrap_Wideband_read__SWIG_0(PyObject *SWIGUNUSEDPARM(self),
size_t arg5 ;
size_t arg6 ;
size_t arg7 ;
std::span< std::byte > *arg8 = 0 ;
gsl::span< std::byte > *arg8 = 0 ;
void *argp1 = 0 ;
int res1 = 0 ;
size_t val2 ;
Expand Down Expand Up @@ -80820,16 +80820,16 @@ SWIGINTERN PyObject *_wrap_Wideband_read__SWIG_0(PyObject *SWIGUNUSEDPARM(self),
arg7 = static_cast< size_t >(val7);
res8 = SWIG_ConvertPtr(obj7, &argp8, SWIGTYPE_p_mem__BufferViewT_unsigned_char_t, 0 | 0);
if (!SWIG_IsOK(res8)) {
SWIG_exception_fail(SWIG_ArgError(res8), "in method '" "Wideband_read" "', argument " "8"" of type '" "std::span< std::byte > const &""'");
SWIG_exception_fail(SWIG_ArgError(res8), "in method '" "Wideband_read" "', argument " "8"" of type '" "gsl::span< std::byte > const &""'");
}
if (!argp8) {
SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Wideband_read" "', argument " "8"" of type '" "std::span< std::byte > const &""'");
SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Wideband_read" "', argument " "8"" of type '" "gsl::span< std::byte > const &""'");
}
arg8 = reinterpret_cast< std::span< std::byte > * >(argp8);
arg8 = reinterpret_cast< gsl::span< std::byte > * >(argp8);
{
try
{
((cphd::Wideband const *)arg1)->read(arg2,arg3,arg4,arg5,arg6,arg7,(std::span< std::byte > const &)*arg8);
((cphd::Wideband const *)arg1)->read(arg2,arg3,arg4,arg5,arg6,arg7,(gsl::span< std::byte > const &)*arg8);
}
catch (const std::exception& e)
{
Expand Down Expand Up @@ -80868,7 +80868,7 @@ SWIGINTERN PyObject *_wrap_Wideband_read__SWIG_1(PyObject *SWIGUNUSEDPARM(self),
PyObject *resultobj = 0;
cphd::Wideband *arg1 = (cphd::Wideband *) 0 ;
size_t arg2 ;
std::span< std::byte > *arg3 = 0 ;
gsl::span< std::byte > *arg3 = 0 ;
void *argp1 = 0 ;
int res1 = 0 ;
size_t val2 ;
Expand All @@ -80892,16 +80892,16 @@ SWIGINTERN PyObject *_wrap_Wideband_read__SWIG_1(PyObject *SWIGUNUSEDPARM(self),
arg2 = static_cast< size_t >(val2);
res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_mem__BufferViewT_unsigned_char_t, 0 | 0);
if (!SWIG_IsOK(res3)) {
SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "Wideband_read" "', argument " "3"" of type '" "std::span< std::byte > const &""'");
SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "Wideband_read" "', argument " "3"" of type '" "gsl::span< std::byte > const &""'");
}
if (!argp3) {
SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Wideband_read" "', argument " "3"" of type '" "std::span< std::byte > const &""'");
SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Wideband_read" "', argument " "3"" of type '" "gsl::span< std::byte > const &""'");
}
arg3 = reinterpret_cast< std::span< std::byte > * >(argp3);
arg3 = reinterpret_cast< gsl::span< std::byte > * >(argp3);
{
try
{
((cphd::Wideband const *)arg1)->read(arg2,(std::span< std::byte > const &)*arg3);
((cphd::Wideband const *)arg1)->read(arg2,(gsl::span< std::byte > const &)*arg3);
}
catch (const std::exception& e)
{
Expand Down Expand Up @@ -81135,8 +81135,8 @@ SWIGINTERN PyObject *_wrap_Wideband_read__SWIG_4(PyObject *SWIGUNUSEDPARM(self),
size_t arg6 ;
std::vector< double,std::allocator< double > > *arg7 = 0 ;
size_t arg8 ;
std::span< std::byte > *arg9 = 0 ;
std::span< std::complex< float > > *arg10 = 0 ;
gsl::span< std::byte > *arg9 = 0 ;
gsl::span< std::complex< float > > *arg10 = 0 ;
void *argp1 = 0 ;
int res1 = 0 ;
size_t val2 ;
Expand Down Expand Up @@ -81216,24 +81216,24 @@ SWIGINTERN PyObject *_wrap_Wideband_read__SWIG_4(PyObject *SWIGUNUSEDPARM(self),
arg8 = static_cast< size_t >(val8);
res9 = SWIG_ConvertPtr(obj8, &argp9, SWIGTYPE_p_mem__BufferViewT_unsigned_char_t, 0 | 0);
if (!SWIG_IsOK(res9)) {
SWIG_exception_fail(SWIG_ArgError(res9), "in method '" "Wideband_read" "', argument " "9"" of type '" "std::span< std::byte > const &""'");
SWIG_exception_fail(SWIG_ArgError(res9), "in method '" "Wideband_read" "', argument " "9"" of type '" "gsl::span< std::byte > const &""'");
}
if (!argp9) {
SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Wideband_read" "', argument " "9"" of type '" "std::span< std::byte > const &""'");
SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Wideband_read" "', argument " "9"" of type '" "gsl::span< std::byte > const &""'");
}
arg9 = reinterpret_cast< std::span< std::byte > * >(argp9);
arg9 = reinterpret_cast< gsl::span< std::byte > * >(argp9);
res10 = SWIG_ConvertPtr(obj9, &argp10, SWIGTYPE_p_mem__BufferViewT_std__complexT_float_t_t, 0 | 0);
if (!SWIG_IsOK(res10)) {
SWIG_exception_fail(SWIG_ArgError(res10), "in method '" "Wideband_read" "', argument " "10"" of type '" "std::span< std::complex< float > > const &""'");
SWIG_exception_fail(SWIG_ArgError(res10), "in method '" "Wideband_read" "', argument " "10"" of type '" "gsl::span< std::complex< float > > const &""'");
}
if (!argp10) {
SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Wideband_read" "', argument " "10"" of type '" "std::span< std::complex< float > > const &""'");
SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Wideband_read" "', argument " "10"" of type '" "gsl::span< std::complex< float > > const &""'");
}
arg10 = reinterpret_cast< std::span< std::complex< float > > * >(argp10);
arg10 = reinterpret_cast< gsl::span< std::complex< float > > * >(argp10);
{
try
{
((cphd::Wideband const *)arg1)->read(arg2,arg3,arg4,arg5,arg6,(std::vector< double,std::allocator< double > > const &)*arg7,arg8,(std::span< std::byte > const &)*arg9,(std::span< std::complex< float > > const &)*arg10);
((cphd::Wideband const *)arg1)->read(arg2,arg3,arg4,arg5,arg6,(std::vector< double,std::allocator< double > > const &)*arg7,arg8,(gsl::span< std::byte > const &)*arg9,(gsl::span< std::complex< float > > const &)*arg10);
}
catch (const std::exception& e)
{
Expand Down Expand Up @@ -81659,11 +81659,11 @@ SWIGINTERN PyObject *_wrap_Wideband_read(PyObject *self, PyObject *args) {
fail:
SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'Wideband_read'.\n"
" Possible C/C++ prototypes are:\n"
" cphd::Wideband::read(size_t,size_t,size_t,size_t,size_t,size_t,std::span< std::byte > const &) const\n"
" cphd::Wideband::read(size_t,std::span< std::byte > const &) const\n"
" cphd::Wideband::read(size_t,size_t,size_t,size_t,size_t,size_t,gsl::span< std::byte > const &) const\n"
" cphd::Wideband::read(size_t,gsl::span< std::byte > const &) const\n"
" cphd::Wideband::read(size_t,size_t,size_t,size_t,size_t,size_t,std::unique_ptr< std::byte[] > &) const\n"
" cphd::Wideband::read(size_t,std::unique_ptr< std::byte[] > &) const\n"
" cphd::Wideband::read(size_t,size_t,size_t,size_t,size_t,std::vector< double,std::allocator< double > > const &,size_t,std::span< std::byte > const &,std::span< std::complex< float > > const &) const\n"
" cphd::Wideband::read(size_t,size_t,size_t,size_t,size_t,std::vector< double,std::allocator< double > > const &,size_t,gsl::span< std::byte > const &,gsl::span< std::complex< float > > const &) const\n"
" cphd::Wideband::read(size_t,size_t,size_t,size_t,size_t,size_t,types::RowCol< size_t > const &,void *) const\n");
return 0;
}
Expand Down Expand Up @@ -175542,7 +175542,7 @@ static PyMethodDef SwigMethods[] = {
""},
{ (char *)"SupportBlock_getFileOffset", _wrap_SupportBlock_getFileOffset, METH_VARARGS, (char *)"SupportBlock_getFileOffset(SupportBlock self, std::string const & id) -> int64_t"},
{ (char *)"SupportBlock_read", _wrap_SupportBlock_read, METH_VARARGS, (char *)"\n"
"read(std::string const & id, size_t numThreads, std::span< std::byte > const & data)\n"
"read(std::string const & id, size_t numThreads, gsl::span< std::byte > const & data)\n"
"SupportBlock_read(SupportBlock self, std::string const & id, size_t numThreads, std::unique_ptr< std::byte[] > & data)\n"
""},
{ (char *)"SupportBlock_readAll", _wrap_SupportBlock_readAll, METH_VARARGS, (char *)"SupportBlock_readAll(SupportBlock self, size_t numThreads, std::unique_ptr< std::byte[] > & data)"},
Expand Down Expand Up @@ -176205,11 +176205,11 @@ static PyMethodDef SwigMethods[] = {
"Wideband_getFileOffset(Wideband self, size_t channel) -> int64_t\n"
""},
{ (char *)"Wideband_read", _wrap_Wideband_read, METH_VARARGS, (char *)"\n"
"read(size_t channel, size_t firstVector, size_t lastVector, size_t firstSample, size_t lastSample, size_t numThreads, std::span< std::byte > const & data)\n"
"read(size_t channel, std::span< std::byte > const & data)\n"
"read(size_t channel, size_t firstVector, size_t lastVector, size_t firstSample, size_t lastSample, size_t numThreads, gsl::span< std::byte > const & data)\n"
"read(size_t channel, gsl::span< std::byte > const & data)\n"
"read(size_t channel, size_t firstVector, size_t lastVector, size_t firstSample, size_t lastSample, size_t numThreads, std::unique_ptr< std::byte[] > & data)\n"
"read(size_t channel, std::unique_ptr< std::byte[] > & data)\n"
"read(size_t channel, size_t firstVector, size_t lastVector, size_t firstSample, size_t lastSample, std_vector_double vectorScaleFactors, size_t numThreads, std::span< std::byte > const & scratch, std::span< std::complex< float > > const & data)\n"
"read(size_t channel, size_t firstVector, size_t lastVector, size_t firstSample, size_t lastSample, std_vector_double vectorScaleFactors, size_t numThreads, gsl::span< std::byte > const & scratch, gsl::span< std::complex< float > > const & data)\n"
"Wideband_read(Wideband self, size_t channel, size_t firstVector, size_t lastVector, size_t firstSample, size_t lastSample, size_t numThreads, RowColSizeT dims, void * data)\n"
""},
{ (char *)"Wideband_getBytesRequiredForRead", _wrap_Wideband_getBytesRequiredForRead, METH_VARARGS, (char *)"\n"
Expand Down Expand Up @@ -178193,8 +178193,8 @@ static swig_type_info _swigt__p_math__linear__VectorT_double_t = {"_p_math__line
static swig_type_info _swigt__p_math__poly__OneDT_double_t = {"_p_math__poly__OneDT_double_t", "six::Poly1D *|cphd::Poly1D *|math::poly::OneD< double > *", 0, 0, (void*)0, 0};
static swig_type_info _swigt__p_math__poly__OneDT_math__linear__VectorNT_3_double_t_t = {"_p_math__poly__OneDT_math__linear__VectorNT_3_double_t_t", "six::PolyXYZ *|cphd::PolyXYZ *|math::poly::OneD< math::linear::VectorN< 3,double > > *", 0, 0, (void*)0, 0};
static swig_type_info _swigt__p_math__poly__TwoDT_double_t = {"_p_math__poly__TwoDT_double_t", "six::Poly2D *|cphd::Poly2D *|math::poly::TwoD< double > *", 0, 0, (void*)0, 0};
static swig_type_info _swigt__p_mem__BufferViewT_std__complexT_float_t_t = {"_p_mem__BufferViewT_std__complexT_float_t_t", "std::span< std::complex< float > > *", 0, 0, (void*)0, 0};
static swig_type_info _swigt__p_mem__BufferViewT_unsigned_char_t = {"_p_mem__BufferViewT_unsigned_char_t", "std::span< std::byte > *|std::span< unsigned char > *", 0, 0, (void*)0, 0};
static swig_type_info _swigt__p_mem__BufferViewT_std__complexT_float_t_t = {"_p_mem__BufferViewT_std__complexT_float_t_t", "gsl::span< std::complex< float > > *", 0, 0, (void*)0, 0};
static swig_type_info _swigt__p_mem__BufferViewT_unsigned_char_t = {"_p_mem__BufferViewT_unsigned_char_t", "gsl::span< std::byte > *|gsl::span< unsigned char > *", 0, 0, (void*)0, 0};
static swig_type_info _swigt__p_mem__ScopedArrayT_unsigned_char_t = {"_p_mem__ScopedArrayT_unsigned_char_t", "std::unique_ptr< std::byte[] > *|std::unique_ptr< unsigned char[] > *", 0, 0, (void*)0, 0};
static swig_type_info _swigt__p_mem__ScopedCopyablePtrT_cphd__Antenna_t = {"_p_mem__ScopedCopyablePtrT_cphd__Antenna_t", "mem::ScopedCopyablePtr< cphd::Antenna > *", 0, 0, (void*)0, 0};
static swig_type_info _swigt__p_mem__ScopedCopyablePtrT_cphd__AreaType_t = {"_p_mem__ScopedCopyablePtrT_cphd__AreaType_t", "mem::ScopedCopyablePtr< cphd::AreaType > *", 0, 0, (void*)0, 0};
Expand Down
Loading

0 comments on commit c10f233

Please sign in to comment.