Ticket #40436: patch-_ecs.cpp.diff

File patch-_ecs.cpp.diff, 2.0 KB (added by ynaito@…, 11 years ago)

patch for ./ecell/pyecell/ecell/_ecs.cpp

  • ./ecell/pyecell/ecell/_ecs.cpp

    old new  
    16551655    mutable String thePrivPrefix;
    16561656};
    16571657
    1658 class PythonProcess: public PythonEntityBase< PythonProcess, Process >
     1658class PythonProcess__in_ecs_cpp__: public PythonEntityBase< PythonProcess__in_ecs_cpp__, Process >
    16591659{
    16601660public:
    1661     virtual ~PythonProcess() {}
     1661    virtual ~PythonProcess__in_ecs_cpp__() {}
    16621662
    16631663    LIBECS_DM_INIT_PROP_INTERFACE()
    16641664    {
     
    17091709        return py::extract< bool >( anIsContinuousDescr.get() );
    17101710    }
    17111711
    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 ) {}
    17141714
    17151715    py::object theFireMethod;
    17161716};
     
    18181818};
    18191819
    18201820template<>
    1821 EntityType DeduceEntityType< PythonProcess >::value( EntityType::PROCESS );
     1821EntityType DeduceEntityType< PythonProcess__in_ecs_cpp__ >::value( EntityType::PROCESS );
    18221822
    18231823template<>
    18241824EntityType DeduceEntityType< PythonVariable >::value( EntityType::VARIABLE );
     
    25872587        switch ( aDMType.getType() )
    25882588        {
    25892589        case EntityType::PROCESS:
    2590             aModule = new PythonDynamicModule< PythonProcess >( obj );
     2590            aModule = new PythonDynamicModule< PythonProcess__in_ecs_cpp__ >( obj );
    25912591            break;
    25922592
    25932593        case EntityType::VARIABLE:
     
    29252925    py::register_exception_translator< std::exception >( &translateException );
    29262926    py::register_exception_translator< std::range_error >( &translateRangeError );
    29272927    PythonVariable::addToRegistry();
    2928     PythonProcess::addToRegistry();
     2928    PythonProcess__in_ecs_cpp__::addToRegistry();
    29292929    PythonSystem::addToRegistry();
    29302930
    29312931    py::def( "getLibECSVersionInfo", &getLibECSVersionInfo );