From 844db44ebf0e1ace3b865a41f4e80efa73817ad1 Mon Sep 17 00:00:00 2001 From: Jean-Paul Chaput Date: Sat, 25 Sep 2021 19:20:57 +0200 Subject: [PATCH] Rename pyTypePostModuleInit<> to pyTypePostInit<> (clearer). --- .../hurricane/configuration/PyBasicLayer.h | 2 +- .../configuration/hurricane/configuration/PyDataBase.h | 4 ++-- .../src/configuration/hurricane/configuration/PyDbU.h | 2 +- .../hurricane/configuration/PyHurricane3.h | 6 +++--- .../configuration/hurricane/configuration/PyMaterial.h | 2 +- .../hurricane/configuration/PyParameter.h | 10 +++++----- .../hurricane/configuration/PyTypeManager.h | 6 +++--- 7 files changed, 16 insertions(+), 16 deletions(-) diff --git a/hurricane/src/configuration/hurricane/configuration/PyBasicLayer.h b/hurricane/src/configuration/hurricane/configuration/PyBasicLayer.h index 7b89a1b6..47efb89a 100644 --- a/hurricane/src/configuration/hurricane/configuration/PyBasicLayer.h +++ b/hurricane/src/configuration/hurricane/configuration/PyBasicLayer.h @@ -33,7 +33,7 @@ extern "C" { template<> - inline void pyTypePostModuleInit ( PyTypeObject* typeObject ) + inline void pyTypePostInit ( PyTypeObject* typeObject ) { PyTypeManagerNonDBo::create( (PyObject*)typeObject , PyMaterial_Methods diff --git a/hurricane/src/configuration/hurricane/configuration/PyDataBase.h b/hurricane/src/configuration/hurricane/configuration/PyDataBase.h index 1e246cfb..b735e6ee 100644 --- a/hurricane/src/configuration/hurricane/configuration/PyDataBase.h +++ b/hurricane/src/configuration/hurricane/configuration/PyDataBase.h @@ -43,7 +43,7 @@ namespace Isobar3 { template<> - inline void pyTypePostModuleInit ( PyTypeObject* typeObject ) + inline void pyTypePostInit ( PyTypeObject* typeObject ) { PyTypeManagerNonDBo::create( (PyObject*)typeObject , PyDataBaseFlags_Methods @@ -54,7 +54,7 @@ namespace Isobar3 { template<> - inline void pyTypePostModuleInit ( PyTypeObject* typeObject ) + inline void pyTypePostInit ( PyTypeObject* typeObject ) { // Parameter::Flags enum. addConstant( typeObject, "NoFlags" , Hurricane::DataBase::NoFlags ); diff --git a/hurricane/src/configuration/hurricane/configuration/PyDbU.h b/hurricane/src/configuration/hurricane/configuration/PyDbU.h index f1ca010b..8362bcf9 100644 --- a/hurricane/src/configuration/hurricane/configuration/PyDbU.h +++ b/hurricane/src/configuration/hurricane/configuration/PyDbU.h @@ -32,7 +32,7 @@ extern "C" { template<> - inline void pyTypePostModuleInit ( PyTypeObject* typeObject ) + inline void pyTypePostInit ( PyTypeObject* typeObject ) { addConstant( typeObject, "SnapModeInferior" , Hurricane::DbU::Inferior ); addConstant( typeObject, "SnapModeSuperior" , Hurricane::DbU::Superior ); diff --git a/hurricane/src/configuration/hurricane/configuration/PyHurricane3.h b/hurricane/src/configuration/hurricane/configuration/PyHurricane3.h index 8dbae340..a9c81d14 100644 --- a/hurricane/src/configuration/hurricane/configuration/PyHurricane3.h +++ b/hurricane/src/configuration/hurricane/configuration/PyHurricane3.h @@ -101,9 +101,9 @@ extern "C" { template< typename CppT > - inline void pyTypePostModuleInit ( PyTypeObject* typeObject ) + inline void pyTypePostInit ( PyTypeObject* typeObject ) { - //cerr << "pyTypePostModuleInit() default for <" + //cerr << "pyTypePostInit() default for <" // << demangle(typeid(CppT).name()) << ">." << endl; } @@ -252,7 +252,7 @@ extern "C" { _managerByCppTypes[ std::type_index(typeid(CppT)) ] = manager; _managerByPyTypes [ manager->_getTypeObject() ] = manager; manager->_addToModule( module ); - pyTypePostModuleInit( manager->_getTypeObject() ); + pyTypePostInit( manager->_getTypeObject() ); // std::cerr << "_managerByCppTypes.size()=" << _managerByCppTypes.size() << std::endl; } diff --git a/hurricane/src/configuration/hurricane/configuration/PyMaterial.h b/hurricane/src/configuration/hurricane/configuration/PyMaterial.h index f713336b..6ed245d1 100644 --- a/hurricane/src/configuration/hurricane/configuration/PyMaterial.h +++ b/hurricane/src/configuration/hurricane/configuration/PyMaterial.h @@ -39,7 +39,7 @@ namespace Isobar3 { template<> - inline void pyTypePostModuleInit ( PyTypeObject* typeObject ) + inline void pyTypePostInit ( PyTypeObject* typeObject ) { addConstant( typeObject, "nWell" , BasicLayer::Material::nWell ); addConstant( typeObject, "pWell" , BasicLayer::Material::pWell ); diff --git a/hurricane/src/configuration/hurricane/configuration/PyParameter.h b/hurricane/src/configuration/hurricane/configuration/PyParameter.h index a9ee3e73..5444c75a 100644 --- a/hurricane/src/configuration/hurricane/configuration/PyParameter.h +++ b/hurricane/src/configuration/hurricane/configuration/PyParameter.h @@ -98,9 +98,9 @@ namespace Isobar3 { template<> - inline void pyTypePostModuleInit ( PyTypeObject* typeObject ) + inline void pyTypePostInit ( PyTypeObject* typeObject ) { - // std::cerr << "pyTypePostModuleInit()" << std::endl; + // std::cerr << "pyTypePostInit()" << std::endl; PyTypeManagerNonDBo::create( (PyObject*)typeObject , Cfg::PyParameterPriority_Methods , NULL @@ -123,7 +123,7 @@ namespace Isobar3 { template<> - inline void pyTypePostModuleInit ( PyTypeObject* typeObject ) + inline void pyTypePostInit ( PyTypeObject* typeObject ) { // Parameter::Priority enum. addConstant( typeObject, "UseDefault" , Cfg::Parameter::UseDefault ); @@ -136,7 +136,7 @@ namespace Isobar3 { template<> - inline void pyTypePostModuleInit ( PyTypeObject* typeObject ) + inline void pyTypePostInit ( PyTypeObject* typeObject ) { // Parameter::Type enum. addConstant( typeObject, "Unknown" , Cfg::Parameter::Unknown ); @@ -150,7 +150,7 @@ namespace Isobar3 { template<> - inline void pyTypePostModuleInit ( PyTypeObject* typeObject ) + inline void pyTypePostInit ( PyTypeObject* typeObject ) { // Parameter::Flags enum. addConstant( typeObject, "HasMin" , Cfg::Parameter::HasMin ); diff --git a/hurricane/src/configuration/hurricane/configuration/PyTypeManager.h b/hurricane/src/configuration/hurricane/configuration/PyTypeManager.h index bb49e984..c680fa2d 100644 --- a/hurricane/src/configuration/hurricane/configuration/PyTypeManager.h +++ b/hurricane/src/configuration/hurricane/configuration/PyTypeManager.h @@ -107,9 +107,9 @@ extern "C" { template< typename CppT > - inline void pyTypePostModuleInit ( PyTypeObject* typeObject ) + inline void pyTypePostInit ( PyTypeObject* typeObject ) { - //cerr << "pyTypePostModuleInit() default for <" + //cerr << "pyTypePostInit() default for <" // << demangle(typeid(CppT).name()) << ">." << endl; } @@ -354,7 +354,7 @@ extern "C" { _managerByCppTypes[ hashCode ] = manager; _managerByPyTypes [ manager->_getTypeObject() ] = manager; manager->_addToModule( module ); - pyTypePostModuleInit( manager->_getTypeObject() ); + pyTypePostInit( manager->_getTypeObject() ); // std::cerr << "_managerByCppTypes.size()=" << _managerByCppTypes.size() << std::endl; }