diff options
author | Boris Kolpackov <boris@codesynthesis.com> | 2024-01-22 12:23:20 +0200 |
---|---|---|
committer | Boris Kolpackov <boris@codesynthesis.com> | 2024-01-22 12:23:20 +0200 |
commit | 78fb7c04ec8825dba7f83d49c8d04853479bba81 (patch) | |
tree | 92ef66846fdf91fac96ee5de54dc8ccdb8b35f76 /odb/processor.cxx | |
parent | 299f76e0fb8621272f983c2f8110185942d3db7e (diff) |
Release version 2.5.0-b.25+12.5.0-b.25+1
Backport the following commits from 2.5.0-b.26:
- Prevent inner self-typedefs from causing scope cycles.
- Skip declarations inside anonymous namespaces.
- Support integer template parameters in parser::emit_type_name().
- Make sure configuration report variables are set in skeleton mode.
- Make GCC plugin directory, g++ executable name customizable.
Diffstat (limited to 'odb/processor.cxx')
-rw-r--r-- | odb/processor.cxx | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/odb/processor.cxx b/odb/processor.cxx index 9cda5e6..d48baa7 100644 --- a/odb/processor.cxx +++ b/odb/processor.cxx @@ -2194,8 +2194,13 @@ namespace namespace_* ns (dynamic_cast<namespace_*> (s)); - if (ns == 0) - continue; // Some other scope. + if (ns == 0) // Some other scope. + { + if (!s->named_p ()) + break; + + continue; + } if (ns->extension ()) ns = &ns->original (); @@ -2207,7 +2212,7 @@ namespace break; } - if (ns->global_scope ()) + if (ns->global_scope ()) // Note: namespaces always named. break; } @@ -2702,15 +2707,20 @@ namespace namespace_* ns (dynamic_cast<namespace_*> (s)); - if (ns == 0) - continue; // Some other scope. + if (ns == 0) // Some other scope. + { + if (!s->named_p ()) + break; + + continue; + } if (ns->extension ()) ns = &ns->original (); if (!ns->count ("pointer")) { - if (ns->global_scope ()) + if (ns->global_scope ()) // Note: namespace always named. break; else continue; |