Commit d6148b9b authored by Charles Delort's avatar Charles Delort
Browse files

fix

parent 6edd8ef1
......@@ -45,7 +45,7 @@ def _guess_cool_type_aliases():
# not working after ROOT 6.18 ROOT-10217, CORALCOOL-3040
#dirTypedefs = dir(getattr(cppyy.gbl,"cool::PyCool::Helpers::Typedefs"))
# Workaround because Pyroot doesn't have this information anymore
dirTypedefs = ['__add__', '__assign__', '__bool__', '__class__', '__cppname__', '__delattr__', '__destruct__', '__dict__', '__dispatch__', '__div__', '__doc__', '__eq__', '__format__', '__ge__', '__getattribute__', '__gt__', '__hash__', '__init__', '__le__', '__lt__', '__module__', '__mul__', '__ne__', '__new__', '__nonzero__', '__radd__', '__rdiv__', '__reduce__', '__reduce_ex__', '__repr__', '__rmul__', '__rsub__', '__scope__', '__setattr__', '__sizeof__', '__str__', '__sub__', '__subclasshook__', '__weakref__', '_get_smart_ptr', 'functiona', 'functiona<bool>', 'functionb', 'functionb<unsigned char>', 'functiond', 'functiond<short>', 'functione', 'functione<unsigned short>', 'functionf', 'functionf<int>', 'functiong', 'functiong<unsigned int>', 'functionh', 'functionh<unsigned long long>', 'functioni', 'functioni<long long>', 'functionj', 'functionj<unsigned long long>', 'functionk', 'functionk<float>', 'functionl', 'functionl<double>', 'functionm', 'functionm<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > >', 'functionn', 'functionn<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > >', 'functiono', 'functiono<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > >', 'functionp', 'functionp<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > >', 'functionq', 'functionq<coral::Blob>', 'functionr', 'functionr<coral::Blob>', 'functions', 'functions<unsigned long long>', 'functiont', 'functiont<unsigned int>', 'type_id_a__Bool', 'type_id_b__UChar', 'type_id_d__Int16', 'type_id_e__UInt16', 'type_id_f__Int32', 'type_id_g__UInt32', 'type_id_h__UInt63', 'type_id_i__Int64', 'type_id_j__UInt64', 'type_id_k__Float', 'type_id_l__Double', 'type_id_m__String255', 'type_id_n__String4k', 'type_id_o__String64k', 'type_id_p__String16M', 'type_id_q__Blob64k', 'type_id_r__Blob16M', 'type_id_u__Blob128M', 'type_id_s__ValidityKey', 'type_id_t__ChannelId']
dirTypedefs = ['__add__', '__assign__', '__bool__', '__class__', '__cppname__', '__delattr__', '__destruct__', '__dict__', '__dispatch__', '__div__', '__doc__', '__eq__', '__format__', '__ge__', '__getattribute__', '__gt__', '__hash__', '__init__', '__le__', '__lt__', '__module__', '__mul__', '__ne__', '__new__', '__nonzero__', '__radd__', '__rdiv__', '__reduce__', '__reduce_ex__', '__repr__', '__rmul__', '__rsub__', '__scope__', '__setattr__', '__sizeof__', '__str__', '__sub__', '__subclasshook__', '__weakref__', '_get_smart_ptr', 'functiona', 'functiona<bool>', 'functionb', 'functionb<unsigned char>', 'functiond', 'functiond<short>', 'functione', 'functione<unsigned short>', 'functionf', 'functionf<int>', 'functiong', 'functiong<unsigned int>', 'functionh', 'functionh<unsigned long long>', 'functioni', 'functioni<long long>', 'functionj', 'functionj<unsigned long long>', 'functionk', 'functionk<float>', 'functionl', 'functionl<double>', 'functionm', 'functionm<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > >', 'functionn', 'functionn<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > >', 'functiono', 'functiono<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > >', 'functionp', 'functionp<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > >', 'functionq', 'functionq<coral::Blob>', 'functionr', 'functionr<coral::Blob>', 'functionu', 'functionu<coral::Blob>', 'functions', 'functions<unsigned long long>', 'functiont', 'functiont<unsigned int>', 'type_id_a__Bool', 'type_id_b__UChar', 'type_id_d__Int16', 'type_id_e__UInt16', 'type_id_f__Int32', 'type_id_g__UInt32', 'type_id_h__UInt63', 'type_id_i__Int64', 'type_id_j__UInt64', 'type_id_k__Float', 'type_id_l__Double', 'type_id_m__String255', 'type_id_n__String4k', 'type_id_o__String64k', 'type_id_p__String16M', 'type_id_q__Blob64k', 'type_id_r__Blob16M', 'type_id_u__Blob128M', 'type_id_s__ValidityKey', 'type_id_t__ChannelId']
for k, v in extract_matches(re.compile(r"type_id_([a-z]*)__(\w*)"),
dirTypedefs):
id2typedef[k] = v
......
......@@ -10,7 +10,6 @@
namespace cool
{
typedef coral::Blob Blob128M;
namespace PyCool
{
namespace Helpers
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment