|
From: <rom...@us...> - 2007-11-13 20:59:14
|
Revision: 1149
http://pygccxml.svn.sourceforge.net/pygccxml/?rev=1149&view=rev
Author: roman_yakovenko
Date: 2007-11-13 12:59:19 -0800 (Tue, 13 Nov 2007)
Log Message:
-----------
using new functionality available on class_t declaration - finx_xxx_constructor
Modified Paths:
--------------
pyplusplus_dev/pyplusplus/module_creator/creator.py
Modified: pyplusplus_dev/pyplusplus/module_creator/creator.py
===================================================================
--- pyplusplus_dev/pyplusplus/module_creator/creator.py 2007-11-13 20:57:25 UTC (rev 1148)
+++ pyplusplus_dev/pyplusplus/module_creator/creator.py 2007-11-13 20:59:19 UTC (rev 1149)
@@ -573,9 +573,7 @@
#next constructors are not present in code, but compiler generated
#Boost.Python requiers them to be declared in the wrapper class
if '0.9' in self.curr_decl.compiler:
- copy_constr = self.curr_decl.constructors( lambda c: c.is_copy_constructor
- , recursive=False
- , allow_empty=True)
+ copy_constr = self.curr_decl.find_copy_constructor()
add_to_wrapper = False
if declarations.has_trivial_copy( self.curr_decl ):
#find out whether user or compiler defined it
@@ -583,30 +581,28 @@
add_to_wrapper = False
elif not copy_constr:
add_to_wrapper = True #compiler defined will not be exposed manually later
- elif copy_constr[0].is_artificial:
+ elif copy_constr.is_artificial:
add_to_wrapper = True #compiler defined will not be exposed manually later
if add_to_wrapper:
cccc = code_creators.copy_constructor_wrapper_t( class_=self.curr_decl)
wrapper.adopt_creator( cccc )
- trivial_constr = self.curr_decl.constructors( lambda c: c.is_trivial_constructor
- , recursive=False
- , allow_empty=True)
+ trivial_constr = self.curr_decl.find_trivial_constructor()
add_to_wrapper = False
if declarations.has_trivial_constructor( self.curr_decl ):
if not trivial_constr:
add_to_wrapper = True
- elif trivial_constr[0].is_artificial:
+ elif trivial_constr.is_artificial:
add_to_wrapper = True
if add_to_wrapper:
tcons = code_creators.null_constructor_wrapper_t( class_=self.curr_decl )
wrapper.adopt_creator( tcons )
else:
if declarations.has_trivial_copy( self.curr_decl ):
- copy_constr = self.curr_decl.constructor( lambda c: c.is_copy_constructor, recursive=False )
+ copy_constr = self.curr_decl.find_copy_constructor()
if not self.curr_decl.noncopyable and copy_constr.is_artificial:
cccc = code_creators.copy_constructor_wrapper_t( class_=self.curr_decl)
wrapper.adopt_creator( cccc )
- null_constr = declarations.find_trivial_constructor(self.curr_decl)
+ null_constr = self.curr_decl.find_trivial_constructor()
if null_constr and null_constr.is_artificial:
#this constructor is not going to be exposed
tcons = code_creators.null_constructor_wrapper_t( class_=self.curr_decl )
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
