|
From: <rom...@us...> - 2006-05-18 06:24:31
|
Revision: 134 Author: roman_yakovenko Date: 2006-05-17 23:24:17 -0700 (Wed, 17 May 2006) ViewCVS: http://svn.sourceforge.net/pygccxml/?rev=134&view=rev Log Message: ----------- porting recent changes to windows Modified Paths: -------------- pyplusplus_dev/examples/pyboost_dev/dev/date_time/customization_data.py pyplusplus_dev/examples/pyboost_dev/dev/date_time/generate_code.py pyplusplus_dev/pyplusplus/code_creators/module.py Modified: pyplusplus_dev/examples/pyboost_dev/dev/date_time/customization_data.py =================================================================== --- pyplusplus_dev/examples/pyboost_dev/dev/date_time/customization_data.py 2006-05-18 05:18:19 UTC (rev 133) +++ pyplusplus_dev/examples/pyboost_dev/dev/date_time/customization_data.py 2006-05-18 06:24:17 UTC (rev 134) @@ -199,7 +199,7 @@ } if sys.platform == 'win32': - name2alias[ "time_duration<boost::posix_time::time_duration,boost::date_time::time_resolution_traits<boost::date_time::time_resolution_traits_adapted64_impl, micro, 1000000, 6, long> >" ] \ + name2alias[ "time_duration<boost::posix_time::time_duration, boost::date_time::time_resolution_traits<boost::date_time::time_resolution_traits_adapted64_impl, (boost::date_time::time_resolutions)5, (long long)1000000, 6, long> >" ] \ = "time_duration_impl" else: name2alias[ "time_duration<boost::posix_time::time_duration, boost::date_time::time_resolution_traits<boost::date_time::time_resolution_traits_adapted64_impl, (boost::date_time::time_resolutions)5, (long long)1000000, 6, int> >" ] \ Modified: pyplusplus_dev/examples/pyboost_dev/dev/date_time/generate_code.py =================================================================== --- pyplusplus_dev/examples/pyboost_dev/dev/date_time/generate_code.py 2006-05-18 05:18:19 UTC (rev 133) +++ pyplusplus_dev/examples/pyboost_dev/dev/date_time/generate_code.py 2006-05-18 06:24:17 UTC (rev 134) @@ -42,12 +42,13 @@ , undefine_symbols=date_time_settings.undefined_symbols , optimize_queries=False) if sys.platform == 'win32': - linux_name = "time_duration<boost::posix_time::time_duration,boost::date_time::time_resolution_traits<boost::date_time::time_resolution_traits_adapted64_impl, micro, 1000000, 6, int> >" - win_name = "time_duration<boost::posix_time::time_duration,boost::date_time::time_resolution_traits<boost::date_time::time_resolution_traits_adapted64_impl, micro, 1000000, 6, long int> >" + linux_name = "time_duration<boost::posix_time::time_duration, boost::date_time::time_resolution_traits<boost::date_time::time_resolution_traits_adapted64_impl, (boost::date_time::time_resolutions)5, (long long)1000000, 6, int> >" + win_name = "time_duration<boost::posix_time::time_duration, boost::date_time::time_resolution_traits<boost::date_time::time_resolution_traits_adapted64_impl, (boost::date_time::time_resolutions)5, (long long)1000000, 6, long> >" time_duration_impl = mb.class_( linux_name ) #small price for generating code from xml and not from sources time_duration_impl.name = win_name - + time_duration_impl.demangled = None + for f_decl in mb.free_functions(): f_decl.alias = f_decl.name f_decl.name = f_decl.demangled_name @@ -151,7 +152,6 @@ extmodule.user_defined_directories.append( date_time_settings.generated_files_dir ) extmodule.license = customization_data.license extmodule.precompiled_header = 'boost/python.hpp' - mb.code_creator.replace_included_headers( customization_data.includes ) self.beautify_code( mb ) def write_files( self, mb ): Modified: pyplusplus_dev/pyplusplus/code_creators/module.py =================================================================== --- pyplusplus_dev/pyplusplus/code_creators/module.py 2006-05-18 05:18:19 UTC (rev 133) +++ pyplusplus_dev/pyplusplus/code_creators/module.py 2006-05-18 06:24:17 UTC (rev 134) @@ -94,7 +94,7 @@ if isinstance( self.creators[i], include.include_t ): return i else: - raise RuntimeError( "include_t creator has not been found." ) + return 0 def first_include_index(self): """Return the children index of the first L{include_t} object. @@ -119,11 +119,12 @@ elif isinstance( creator, module_body.module_body_t ): break + boost_python_header = include_directories.include_directories_t.normalize( 'boost/python.hpp' ) boost_python_treated = False for creator in to_be_removed: if not boost_python_treated: boost_python_treated = True - if 'boost/python.hpp' in creator.header: + if boost_python_header in creator.header: if not leave_boost_python_header: self.remove_creator( creator ) else: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
