+2008-02-24 Jason Merrill <jason@redhat.com>
+
+ * parser.c (cp_parser_declaration): Handle "inline namespace".
+ (cp_parser_namespace_definition): Likewise.
+
+ PR c++/33486
+ * name-lookup.c (arg_assoc_namespace): Look down into inline
+ namespaces, too.
+
2008-02-23 Manuel Lopez-Ibanez <manu@gcc.gnu.org>
* typeck.c (check_for_casting_away_constness): Use 1 single
if (arg_assoc_namespace (k, TREE_PURPOSE (value)))
return true;
+ /* Also look down into inline namespaces. */
+ for (value = DECL_NAMESPACE_USING (scope); value;
+ value = TREE_CHAIN (value))
+ if (is_associated_namespace (scope, TREE_PURPOSE (value)))
+ if (arg_assoc_namespace (k, TREE_PURPOSE (value)))
+ return true;
+
value = namespace_binding (k->name, scope);
if (!value)
return false;
|| token2.type == CPP_OPEN_BRACE
|| token2.keyword == RID_ATTRIBUTE))
cp_parser_namespace_definition (parser);
+ /* An inline (associated) namespace definition. */
+ else if (token1.keyword == RID_INLINE
+ && token2.keyword == RID_NAMESPACE)
+ cp_parser_namespace_definition (parser);
/* Objective-C++ declaration/definition. */
else if (c_dialect_objc () && OBJC_IS_AT_KEYWORD (token1.keyword))
cp_parser_objc_declaration (parser);
{
tree identifier, attribs;
bool has_visibility;
+ bool is_inline;
+
+ if (cp_lexer_next_token_is_keyword (parser->lexer, RID_INLINE))
+ {
+ is_inline = true;
+ cp_lexer_consume_token (parser->lexer);
+ }
+ else
+ is_inline = false;
/* Look for the `namespace' keyword. */
cp_parser_require_keyword (parser, RID_NAMESPACE, "`namespace'");
/* Start the namespace. */
push_namespace (identifier);
+ /* "inline namespace" is equivalent to a stub namespace definition
+ followed by a strong using directive. */
+ if (is_inline)
+ {
+ tree namespace = current_namespace;
+ /* Set up namespace association. */
+ DECL_NAMESPACE_ASSOCIATIONS (namespace)
+ = tree_cons (CP_DECL_CONTEXT (namespace), NULL_TREE,
+ DECL_NAMESPACE_ASSOCIATIONS (namespace));
+ /* Import the contents of the inline namespace. */
+ pop_namespace ();
+ do_using_directive (namespace);
+ push_namespace (identifier);
+ }
+
has_visibility = handle_namespace_attrs (current_namespace, attribs);
/* Parse the body of the namespace. */
// { dg-do compile }
namespace fool {
- namespace foo {
+ inline namespace foo {
template <class T> void swap(T, T);
}
- using namespace foo __attribute__((strong));
template <class T> void swap(T);
}
// { dg-do compile }
namespace foo {
- namespace foo_impl {
+ inline namespace foo_impl {
class T; // { dg-error "T" "" }
}
- using namespace foo_impl __attribute__((strong));
}
namespace bar {
- namespace bar_impl {
+ inline namespace bar_impl {
class T; // { dg-error "T" "" }
}
- using namespace bar_impl __attribute__((strong));
using namespace foo;
}
namespace baz {
// { dg-do compile }
namespace bar {
- namespace foo {
+ inline namespace foo {
template <class T> void f(T, T);
}
- using namespace foo __attribute__((strong));
template <class T> void f(T);
}
--- /dev/null
+// PR c++/33486
+
+namespace A
+{
+ inline namespace B
+ {
+ struct T
+ {
+ struct U { };
+ U f();
+ };
+ }
+
+ inline namespace C
+ {
+ void g (T::U);
+ }
+}
+
+int main()
+{
+ A::T t;
+ g(t.f());
+}
+2008-02-20 Jason Merrill <jason@redhat.com>
+
+ * include/bits/c++config: Use 'inline namespace' instead of
+ strong using.
+
2008-02-18 Pedro Lamarao <pedro.lamarao@mndfck.org>
* include/std/tuple: Fixes for moveable, non-copyable types.
namespace std
{
namespace __norm { }
- namespace __debug { }
- namespace __cxx1998 { }
-
- using namespace __debug __attribute__ ((strong));
- using namespace __cxx1998 __attribute__ ((strong));
+ inline namespace __debug { }
+ inline namespace __cxx1998 { }
}
#endif
namespace std
{
namespace __norm { }
- namespace __parallel { }
- namespace __cxx1998 { }
-
- using namespace __parallel __attribute__ ((strong));
- using namespace __cxx1998 __attribute__ ((strong));
+ inline namespace __parallel { }
+ inline namespace __cxx1998 { }
}
#endif
#if _GLIBCXX_NAMESPACE_ASSOCIATION_VERSION
namespace std
{
- namespace _6 { }
- using namespace _6 __attribute__ ((strong));
+ inline namespace _6 { }
}
namespace __gnu_cxx
{
- namespace _6 { }
- using namespace _6 __attribute__ ((strong));
+ inline namespace _6 { }
}
namespace std
{
namespace tr1
{
- namespace _6 { }
- using namespace _6 __attribute__ ((strong));
+ inline namespace _6 { }
}
}
#endif
# define _GLIBCXX_LDBL_NAMESPACE __gnu_cxx_ldbl128::
# define _GLIBCXX_BEGIN_LDBL_NAMESPACE namespace __gnu_cxx_ldbl128 {
# define _GLIBCXX_END_LDBL_NAMESPACE }
- namespace __gnu_cxx_ldbl128 { }
- using namespace __gnu_cxx_ldbl128 __attribute__((__strong__));
+ inline namespace __gnu_cxx_ldbl128 { }
#else
# define _GLIBCXX_LDBL_NAMESPACE
# define _GLIBCXX_BEGIN_LDBL_NAMESPACE