Fix C++ division when true division is enabled.

This fixes Github issue #1950.

Cython/Compiler/ExprNodes.py

@@ -11559,7 +11559,7 @@ class DivNode(NumBinopNode):
                 self.operand2 = self.operand2.coerce_to_simple(env)
 
     def compute_c_result_type(self, type1, type2):
-        if self.operator == '/' and self.ctruedivision:
+        if self.operator == '/' and self.ctruedivision and not self.is_cpp_operation():
             if not type1.is_float and not type2.is_float:
                 widest_type = PyrexTypes.widest_numeric_type(type1, PyrexTypes.c_double_type)
                 widest_type = PyrexTypes.widest_numeric_type(type2, widest_type)
@@ -11650,7 +11650,7 @@ class DivNode(NumBinopNode):
                 code.putln("}")
 
     def calculate_result_code(self):
-        if self.type.is_complex:
+        if self.type.is_complex or self.is_cpp_operation():
             return NumBinopNode.calculate_result_code(self)
         elif self.type.is_float and self.operator == '//':
             return "floor(%s / %s)" % (

tests/run/cpp_operators.pyx

 # mode: run
 # tag: cpp, werror
 
+from __future__ import division
+
 from cython cimport typeof
 
 cimport cython.operator
@@ -239,7 +241,7 @@ def test_nonmember_binop():
     nonmember binary2 >> [const_char *]
     nonmember binary2 COMMA [const_char *]
     """
-    
+
     cdef TestOps* t = new TestOps()
     out(1 + t[0], typeof(1 + t[0]))
     out(1 - t[0], typeof(1 - t[0]))
@@ -251,10 +253,10 @@ def test_nonmember_binop():
     out(1 ^ t[0], typeof(1 ^ t[0]))
     out(1 << t[0], typeof(1 << t[0]))
     out(1 >> t[0], typeof(1 >> t[0]))
-    
+
     x = cython.operator.comma(1, t[0])
     out(x, typeof(x))
-    
+
     # now test float operators defined outside class
     out(1. + t[0], typeof(1. + t[0]))
     # operator - deliberately omitted
@@ -266,7 +268,7 @@ def test_nonmember_binop():
     out(1. ^ t[0], typeof(1. ^ t[0]))
     out(1. << t[0], typeof(1. << t[0]))
     out(1. >> t[0], typeof(1. >> t[0]))
-    
+
     # for some reason we need a cdef here - not sure this is quite right
     y = cython.operator.comma(1., t[0])
     out(y, typeof(y))