Ticket #40436: patch-_ecs.cpp.diff
File patch-_ecs.cpp.diff, 2.0 KB (added by ynaito@…, 11 years ago) |
---|
-
./ecell/pyecell/ecell/_ecs.cpp
old new 1655 1655 mutable String thePrivPrefix; 1656 1656 }; 1657 1657 1658 class PythonProcess : public PythonEntityBase< PythonProcess, Process >1658 class PythonProcess__in_ecs_cpp__: public PythonEntityBase< PythonProcess__in_ecs_cpp__, Process > 1659 1659 { 1660 1660 public: 1661 virtual ~PythonProcess () {}1661 virtual ~PythonProcess__in_ecs_cpp__() {} 1662 1662 1663 1663 LIBECS_DM_INIT_PROP_INTERFACE() 1664 1664 { … … 1709 1709 return py::extract< bool >( anIsContinuousDescr.get() ); 1710 1710 } 1711 1711 1712 PythonProcess ( PythonDynamicModule< PythonProcess> const& aModule )1713 : PythonEntityBase< PythonProcess , Process >( aModule ) {}1712 PythonProcess__in_ecs_cpp__( PythonDynamicModule< PythonProcess__in_ecs_cpp__ > const& aModule ) 1713 : PythonEntityBase< PythonProcess__in_ecs_cpp__, Process >( aModule ) {} 1714 1714 1715 1715 py::object theFireMethod; 1716 1716 }; … … 1818 1818 }; 1819 1819 1820 1820 template<> 1821 EntityType DeduceEntityType< PythonProcess >::value( EntityType::PROCESS );1821 EntityType DeduceEntityType< PythonProcess__in_ecs_cpp__ >::value( EntityType::PROCESS ); 1822 1822 1823 1823 template<> 1824 1824 EntityType DeduceEntityType< PythonVariable >::value( EntityType::VARIABLE ); … … 2587 2587 switch ( aDMType.getType() ) 2588 2588 { 2589 2589 case EntityType::PROCESS: 2590 aModule = new PythonDynamicModule< PythonProcess >( obj );2590 aModule = new PythonDynamicModule< PythonProcess__in_ecs_cpp__ >( obj ); 2591 2591 break; 2592 2592 2593 2593 case EntityType::VARIABLE: … … 2925 2925 py::register_exception_translator< std::exception >( &translateException ); 2926 2926 py::register_exception_translator< std::range_error >( &translateRangeError ); 2927 2927 PythonVariable::addToRegistry(); 2928 PythonProcess ::addToRegistry();2928 PythonProcess__in_ecs_cpp__::addToRegistry(); 2929 2929 PythonSystem::addToRegistry(); 2930 2930 2931 2931 py::def( "getLibECSVersionInfo", &getLibECSVersionInfo );