Skip to content

Commit a19c1ea

Browse files
committed
Allow the tr1 replacement only for declarations
Travis reports some type_ variables which are of type class_t
1 parent ceecf7d commit a19c1ea

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

pygccxml/declarations/container_traits.py

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -412,15 +412,15 @@ def get_container_or_none(self, type_):
412412
"declaration starts with " + self.name() + '<')
413413
return
414414

415-
is_ns = isinstance(type_.declaration.parent, namespace.namespace_t)
416-
if is_ns and type_.declaration.parent.name == "tr1":
417-
# When using libstd++, some container traits are defined in
418-
# std::tr1:: . See remove_template_defaults_tester.py.
419-
# In this case the is_defined_in_xxx test needs to be done
420-
# on the parent
421-
decl = cls_declaration.parent
422-
else:
423-
decl = cls_declaration
415+
decl = cls_declaration
416+
if isinstance(type_, cpptypes.declarated_t):
417+
is_ns = isinstance(type_.declaration.parent, namespace.namespace_t)
418+
if is_ns and type_.declaration.parent.name == "tr1":
419+
# When using libstd++, some container traits are defined in
420+
# std::tr1:: . See remove_template_defaults_tester.py.
421+
# In this case the is_defined_in_xxx test needs to be done
422+
# on the parent
423+
decl = cls_declaration.parent
424424

425425
for ns in std_namespaces:
426426
if type_traits.impl_details.is_defined_in_xxx(ns, decl):

0 commit comments

Comments
 (0)