Fix C# std::complex pass by value typemaps

This commit is contained in:
William S Fulton 2017-10-02 19:06:06 +01:00
commit a55981b883
7 changed files with 45 additions and 20 deletions

View file

@ -14,24 +14,24 @@
%template(VectorStdCplx) std::vector<std::complex<double> >;
#endif
%inline
%inline
{
std::complex<double> Conj(const std::complex<double>& a)
std::complex<double> Conj(std::complex<double> a)
{
return std::conj(a);
}
}
std::complex<float> Conjf(const std::complex<float>& a)
std::complex<float> Conjf(std::complex<float> a)
{
return std::conj(a);
}
}
std::vector<std::complex<double> > Copy_h(const std::vector<std::complex<double> >& a)
std::vector<std::complex<double> > CopyHalf(std::vector<std::complex<double> > a)
{
std::vector<std::complex<double> > b(a.size()/2);
std::copy(a.begin(), a.begin()+a.size()/2, b.begin());
return b;
}
}
using namespace std;
@ -41,14 +41,25 @@
complex<double> z2;
};
complex<double> Conj2(const complex<double>& a)
const complex<double>& Conj2(const complex<double>& a)
{
return std::conj(a);
static complex<double> ret;
ret = std::conj(a);
return ret;
}
complex<float> Conjf2(const complex<float>& a)
const complex<float>& Conjf2(const complex<float>& a)
{
return std::conj(a);
static complex<float> ret;
ret = std::conj(a);
return ret;
}
const vector<complex<double> >& CopyHalfRef(const vector<complex<double> >& a)
{
static vector<complex<double> > b;
b = CopyHalf(a);
return b;
}
}
@ -59,7 +70,7 @@
%{
%}
%inline
%inline
{
complex Conj(complex a)
{