Commit 50531a2a by Ville Voutilainen Committed by Ville Voutilainen

Implement P0962

* parser.c (cp_parser_perform_range_for_lookup): Change
the condition for deciding whether to use members.

From-SVN: r258803
parent b01556f7
2018-03-23 Ville Voutilainen <ville.voutilainen@gmail.com>
Implement P0962
* parser.c (cp_parser_perform_range_for_lookup): Change
the condition for deciding whether to use members.
2018-03-23 Marek Polacek <polacek@redhat.com> 2018-03-23 Marek Polacek <polacek@redhat.com>
PR c++/85033 PR c++/85033
......
...@@ -12048,7 +12048,7 @@ cp_parser_perform_range_for_lookup (tree range, tree *begin, tree *end) ...@@ -12048,7 +12048,7 @@ cp_parser_perform_range_for_lookup (tree range, tree *begin, tree *end)
/*protect=*/2, /*want_type=*/false, /*protect=*/2, /*want_type=*/false,
tf_warning_or_error); tf_warning_or_error);
if (member_begin != NULL_TREE || member_end != NULL_TREE) if (member_begin != NULL_TREE && member_end != NULL_TREE)
{ {
/* Use the member functions. */ /* Use the member functions. */
if (member_begin != NULL_TREE) if (member_begin != NULL_TREE)
...@@ -3,18 +3,6 @@ ...@@ -3,18 +3,6 @@
// { dg-do compile { target c++11 } } // { dg-do compile { target c++11 } }
//These should not be used
template<typename T> int *begin(T &t)
{
T::fail;
return 0;
}
template<typename T> int *end(T &t)
{
T::fail;
return 0;
}
struct container1 struct container1
{ {
int *begin(); int *begin();
...@@ -89,10 +77,37 @@ struct container10 ...@@ -89,10 +77,37 @@ struct container10
static function end; static function end;
}; };
namespace N
{
template<typename T> int *begin(T &t)
{
return 0;
}
template<typename T> int *end(T &t)
{
return 0;
}
struct container11
{
int *begin();
//no end
};
struct container12
{
int *end();
//no begin
};
struct container13
{
};
}
void test1() void test1()
{ {
for (int x : container1()); // { dg-error "member but not" } for (int x : container1()); // { dg-error "'begin' was not declared|'end' was not declared" }
for (int x : container2()); // { dg-error "member but not" } for (int x : container2()); // { dg-error "'begin' was not declared|'end' was not declared" }
for (int x : container3()); // { dg-error "within this context" } for (int x : container3()); // { dg-error "within this context" }
for (int x : container4()); // { dg-error "cannot be used as a function" } for (int x : container4()); // { dg-error "cannot be used as a function" }
for (int x : container5()); // { dg-error "invalid use of" } for (int x : container5()); // { dg-error "invalid use of" }
...@@ -101,4 +116,7 @@ void test1() ...@@ -101,4 +116,7 @@ void test1()
for (int x : container8()); for (int x : container8());
for (int x : container9()); // { dg-error "within this context" } for (int x : container9()); // { dg-error "within this context" }
for (int x : container10()); for (int x : container10());
for (int x : N::container11());
for (int x : N::container12());
for (int x : N::container13());
} }
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