Fix std::complex conversion

barche · barche · commit cce6e5759399 · 2018-05-21T18:36:35.000+02:00
diff --git a/include/jlcxx/type_conversion.hpp b/include/jlcxx/type_conversion.hpp
@@ -1434,7 +1434,7 @@ template<typename NumberT> struct static_type_mapping<std::complex<NumberT>>
 };
 
 template<typename NumberT>
-struct ConvertToCpp<std::complex<NumberT>, false, true, true>
+struct ConvertToCpp<std::complex<NumberT>, true, false, false>
 {
   std::complex<NumberT> operator()(std::complex<NumberT> julia_value) const
   {
@@ -1443,7 +1443,7 @@ struct ConvertToCpp<std::complex<NumberT>, false, true, true>
 };
 
 template<typename NumberT>
-struct ConvertToJulia<std::complex<NumberT>, false, true, true>
+struct ConvertToJulia<std::complex<NumberT>, true, false, false>
 {
   detail::JuliaComplex<NumberT> operator()(std::complex<NumberT> cpp_value) const
   {

Original file line number	Diff line number	Diff line change
`@@ -1434,7 +1434,7 @@ template<typename NumberT> struct static_type_mapping<std::complex<NumberT>>`
`1434`	`1434`	`};`
`1435`	`1435`
`1436`	`1436`	`template<typename NumberT>`
`1437`		`-struct ConvertToCpp<std::complex<NumberT>, false, true, true>`
	`1437`	`+struct ConvertToCpp<std::complex<NumberT>, true, false, false>`
`1438`	`1438`	`{`
`1439`	`1439`	`std::complex<NumberT> operator()(std::complex<NumberT> julia_value) const`
`1440`	`1440`	`{`
`@@ -1443,7 +1443,7 @@ struct ConvertToCpp<std::complex<NumberT>, false, true, true>`
`1443`	`1443`	`};`
`1444`	`1444`
`1445`	`1445`	`template<typename NumberT>`
`1446`		`-struct ConvertToJulia<std::complex<NumberT>, false, true, true>`
	`1446`	`+struct ConvertToJulia<std::complex<NumberT>, true, false, false>`
`1447`	`1447`	`{`
`1448`	`1448`	`detail::JuliaComplex<NumberT> operator()(std::complex<NumberT> cpp_value) const`
`1449`	`1449`	`{`