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.

1 files changed, 2 insertions, 2 deletions

diff --git a/odb/semantics/elements.cxx b/odb/semantics/elements.cxx
index fba9b9b..b5793d0 100644
--- a/odb/semantics/elements.cxx
+++ b/odb/semantics/elements.cxx
@@ -56,7 +56,7 @@ namespace semantics
       if (p == &s)
         return true;
 
-      if (p->global_scope ())
+      if (!p->named_p () || p->global_scope ())
         break;
     }
 
@@ -476,7 +476,7 @@ namespace semantics
     // Look in the outer scope unless requested not to or if this is
     // the global scope.
     //
-    if ((flags & exclude_outer) == 0 && !global_scope ())
+    if ((flags & exclude_outer) == 0 && named_p () && !global_scope ())
       return scope ().lookup (name, ti, flags, hidden);
 
     return 0;