diff options
| author | Stefan Behnel <stefan_ml@behnel.de> | 2017-10-29 07:25:16 +0100 |
|---|---|---|
| committer | Stefan Behnel <stefan_ml@behnel.de> | 2017-10-29 07:25:16 +0100 |
| commit | 77fc0ac316da08cbe2cb9c6891b6174a969422b1 (patch) | |
| tree | 63be45d8f30703addb8d05a8b34cd3f822c5bd92 | |
| parent | 1833eba80b9dc61f6e175a1eca6e7c97d9150db8 (diff) | |
| parent | 7440949119b3eb1034f33af35686eeedbb5a4f4c (diff) | |
| download | cython-77fc0ac316da08cbe2cb9c6891b6174a969422b1.tar.gz | |
Merge branch '0.27.x'
| -rw-r--r-- | Cython/Compiler/PyrexTypes.py | 2 | ||||
| -rw-r--r-- | Cython/Utility/CppSupport.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Cython/Compiler/PyrexTypes.py b/Cython/Compiler/PyrexTypes.py index 46bf8a2fb..53fd78aef 100644 --- a/Cython/Compiler/PyrexTypes.py +++ b/Cython/Compiler/PyrexTypes.py @@ -1475,7 +1475,7 @@ class CType(PyrexType): class PythranExpr(CType): # Pythran object of a given type - to_py_function = "to_python_from_expr" + to_py_function = "__Pyx_pythran_to_python" is_pythran_expr = True writable = True has_attributes = 1 diff --git a/Cython/Utility/CppSupport.cpp b/Cython/Utility/CppSupport.cpp index 7a3053213..b8fcff064 100644 --- a/Cython/Utility/CppSupport.cpp +++ b/Cython/Utility/CppSupport.cpp @@ -50,7 +50,7 @@ static void __Pyx_CppExn2PyErr() { /////////////// PythranConversion.proto /////////////// template <class T> -auto to_python_from_expr(T &&value) -> decltype(to_python( +auto __Pyx_pythran_to_python(T &&value) -> decltype(to_python( typename pythonic::returnable<typename std::remove_cv<typename std::remove_reference<T>::type>::type>::type{std::forward<T>(value)})) { using returnable_type = typename pythonic::returnable<typename std::remove_cv<typename std::remove_reference<T>::type>::type>::type; |