Author: Wim Lavrijsen <wlavrij...@lbl.gov>
Branch: cppyy-packaging
Changeset: r94892:92f43bfdbe30
Date: 2018-07-26 09:17 -0700
http://bitbucket.org/pypy/pypy/changeset/92f43bfdbe30/
Log: annotator fixes
diff --git a/pypy/module/_cppyy/interp_cppyy.py
b/pypy/module/_cppyy/interp_cppyy.py
--- a/pypy/module/_cppyy/interp_cppyy.py
+++ b/pypy/module/_cppyy/interp_cppyy.py
@@ -841,10 +841,10 @@
return cppol
def instantiate_and_call(self, name, args_w):
- # existing cached instantiations
method = None
try:
- if name[-1] == '>': # full templated name, so ensure explicit
+ # existing cached instantiations
+ if name[-1] == '>': # only accept full templated name, to ensure
explicit
method = self.master.overloads[name]
else:
# try to match with run-time instantiations
@@ -994,7 +994,7 @@
self.w_this = space.w_None
def clone(self, tmpl_args):
- other = W_CPPTemplateOverload(self.space, self.name, tmpl_args,
self.scope, self.functions, self.flags)
+ other = W_CPPTemplateStaticOverload(self.space, self.name, tmpl_args,
self.scope, self.functions, self.flags)
other.overloads = self.overloads
other.master = self.master
other.w_this = self.w_this
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
