diff --git a/hurricane/src/configuration/hurricane/configuration/PyCollection.h b/hurricane/src/configuration/hurricane/configuration/PyCollection.h index 723413a0..a1a00027 100644 --- a/hurricane/src/configuration/hurricane/configuration/PyCollection.h +++ b/hurricane/src/configuration/hurricane/configuration/PyCollection.h @@ -211,8 +211,8 @@ namespace Isobar3 { PyTypeObject* ob_type = manager->_getTypeObject(); ob_type->tp_iter = (getiterfunc)&::Isobar3::_tpIter; - std::cerr << "Add to manager: <" - << ::Hurricane::demangle(typeid( Hurricane::Collection )) << ">" << std::endl; + //std::cerr << "Add to manager: <" + // << ::Hurricane::demangle(typeid( Hurricane::Collection )) << ">" << std::endl; PyTypeManager::add< Hurricane::Collection > ( module, manager, typeid(Hurricane::Collection).hash_code() ); PyTypeManagerLocator::create( module, flags ); diff --git a/hurricane/src/configuration/hurricane/configuration/PyMap.h b/hurricane/src/configuration/hurricane/configuration/PyMap.h index dad38f6e..5b5a7fff 100644 --- a/hurricane/src/configuration/hurricane/configuration/PyMap.h +++ b/hurricane/src/configuration/hurricane/configuration/PyMap.h @@ -117,7 +117,7 @@ namespace Isobar3 { string elementName = ::Hurricane::demangle(typeid(CppT)); size_t cppScope = elementName.find_last_of( "::" ); if (cppScope != std::string::npos) elementName = elementName.substr( cppScope+1 ); - cerr << "elementName: " << elementName < PyObject* PyTypeManagerMap::_getMpSubscript ( PyObject* self, PyObject* pyKey ) { - std::cerr << "PyTypeManagerMap::_getMpSubscript" << endl; - std::cerr << "CppK: " << demangle(typeid(CppK)) << std::endl; - std::cerr << "CppT: " << demangle(typeid(CppT)) << std::endl; + //std::cerr << "PyTypeManagerMap::_getMpSubscript" << endl; + //std::cerr << "CppK: " << demangle(typeid(CppK)) << std::endl; + //std::cerr << "CppT: " << demangle(typeid(CppT)) << std::endl; std::map* pmap = NULL; if (not pyToC(self,&pmap)) { std::string message = "PyTypeManagerMap::_getMpSubscript(): pyToC<> failed. \"."; @@ -228,7 +228,7 @@ namespace Isobar3 { return NULL; } CppK key; - std::cerr << "extracting key, type: " << demangle(typeid(CppK)) << std::endl; + //std::cerr << "extracting key, type: " << demangle(typeid(CppK)) << std::endl; if (not pyToC( pyKey, &key )) { std::string message = "PyTypeManagerMap::_getMpSubscript(): Unable to convert key."; PyErr_SetString( HurricaneError, message.c_str() ); @@ -266,10 +266,9 @@ namespace Isobar3 { template< typename CppK, typename CppT > PyTypeManagerMap* PyTypeManagerMap::create ( PyObject* module, uint64_t flags ) { - cerr << "PyTypeManagerMap<" - << ::Hurricane::demangle(typeid(std::map)) << ">::create()" << endl; - - cerr << "CppK: " << demangle(typeid(CppK)) << endl <<" CppT: " << demangle(typeid(CppT)) << endl; + // cerr << "PyTypeManagerMap<" + // << ::Hurricane::demangle(typeid(std::map)) << ">::create()" << endl; + // cerr << "CppK: " << demangle(typeid(CppK)) << endl <<" CppT: " << demangle(typeid(CppT)) << endl; PyTypeManagerMap* manager = new PyTypeManagerMap( flags ); diff --git a/hurricane/src/configuration/hurricane/configuration/PyTypeManager.h b/hurricane/src/configuration/hurricane/configuration/PyTypeManager.h index c80e37b0..caab303b 100644 --- a/hurricane/src/configuration/hurricane/configuration/PyTypeManager.h +++ b/hurricane/src/configuration/hurricane/configuration/PyTypeManager.h @@ -435,12 +435,12 @@ extern "C" { template< typename CppT > inline PyObject* PyTypeManager::link ( CppT* object ) { - std::cerr << "PyTypeManager::link() " << demangle(typeid(CppT).name()) - << "* object = " << (void*)object << ":" << object << std::endl; + // std::cerr << "PyTypeManager::link() " << demangle(typeid(CppT).name()) + // << "* object = " << (void*)object << ":" << object << std::endl; if (not object) Py_RETURN_NONE; PyTypeManagerVTrunk* manager = dynamic_cast< PyTypeManagerVTrunk* >( _get() ); - std::cerr << "_get()=" << _get() << endl; - std::cerr << demangle(typeid(PyTypeManagerVTrunk*).name()) << endl; + // std::cerr << "_get()=" << _get() << endl; + // std::cerr << demangle(typeid(PyTypeManagerVTrunk*).name()) << endl; if (not manager) throw Error( "PyTypeManager::link(): No manager for type <%s>." , demangle(typeid(CppT).name()).c_str() ); @@ -1584,7 +1584,7 @@ template< typename T , typename std::enable_if< !std::is_pointer::value, bool >::type = true > inline bool pyToC ( PyObject* pyArg, T* arg ) { - std::cerr << "template< typename T , typename std::enable_if< !std::is_pointer::value, bool >::type = true > pyToC( PyObject* pyArg, T* arg ) " << " T = " << demangle(typeid(T).name()) <::value, bool >::type = true > pyToC( PyObject* pyArg, T* arg ) " << " T = " << demangle(typeid(T).name()) <::type NonConstT; Isobar3::PyTypeManager* manager = Isobar3::PyTypeManager::_get(); if (not manager) { @@ -1600,14 +1600,14 @@ inline bool pyToC ( PyObject* pyArg, T* arg ) template inline bool pyToC ( PyObject* pyArg, T** arg ) { - std::cerr << "template pyToC( PyObject* pyArg, T** arg ) " << " T = " << demangle(typeid(T).name()) < pyToC( PyObject* pyArg, T** arg ) " << " T = " << demangle(typeid(T).name()) <(); if (not manager) { std::cerr << "Isobar3::pyToC(T*&): Unsupported type \"" << demangle(typeid(T).name()) << "\"" << std::endl; return false; } - std::cerr << "pyToC< " << demangle(typeid(T).name()) << " >() called." << std::endl; + // std::cerr << "pyToC< " << demangle(typeid(T).name()) << " >() called." << std::endl; *arg = (T*)( Isobar3::object1( pyArg )); std::cerr << "returning "<::ValueT).name()) << ">" << std::endl; - std::cerr << "Calling pyToC<" << demangle(typeid(&(as( args[count]))).name()) << ">" << std::endl; + // std::cerr << "Calling pyToC<" << demangle(typeid(typename Arg::ValueT).name()) << ">" << std::endl; + // std::cerr << "Calling pyToC<" << demangle(typeid(&(as( args[count]))).name()) << ">" << std::endl; //success = success and pyToC< typename Arg::ValueT >( pyArgs[count] // , &(as( args[count])) ); success = success and pyToC( pyArgs[count], &(as( args[count])) ); - std::cerr << "success=" << success << std::endl; + // std::cerr << "success=" << success << std::endl; if (not success) { message += "\n " + getString(nth) + " X argument is not convertible to \"" + Hurricane::demangle(typeid(T).name()) + "\"."; PyErr_SetString( Isobar3::ConstructorError, message.c_str() );