From: Robert Bradshaw <robertwb@math.washington.edu>
Date: Tue, 9 Jun 2009 04:17:53 +0000 (-0700)
Subject: More on cpp class declaration_code
X-Git-Tag: 0.13.beta0~353^2~82
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=907de12ec3744ef779735a72d7695df37fac0015;p=cython.git

More on cpp class declaration_code
---

diff --git a/Cython/Compiler/PyrexTypes.py b/Cython/Compiler/PyrexTypes.py
index 6a54d91e..001beb25 100644
--- a/Cython/Compiler/PyrexTypes.py
+++ b/Cython/Compiler/PyrexTypes.py
@@ -1388,12 +1388,12 @@ class CppClassType(CType):
 
     def declaration_code(self, entity_code, for_display = 0, dll_linkage = None, pyrex = 0):
         if for_display or pyrex:
-            return self.name
+            name = self.name
         else:
-            cname = self.cname
+            name = self.cname
             if self.namespace is not None:
-                cname = "%s::%s" % (self.namespace.replace('.', '::'), cname)
-            return cname
+                name = "%s::%s" % (self.namespace.replace('.', '::'), name)
+        return "%s %s" % (name, entity_code)
 
     def is_subclass(self, other_type):
         if not base_classes.empty():