From 39fcc9a984e2820e4ea0fa2ac4abd17d9f3a31df Mon Sep 17 00:00:00 2001 From: dim Date: Sun, 20 Feb 2011 13:06:31 +0000 Subject: Vendor import of clang trunk r126079: http://llvm.org/svn/llvm-project/cfe/trunk@126079 --- test/CXX/class/class.nest/p1-cxx0x.cpp | 14 ++++++++++++++ test/CXX/class/class.nest/p1.cpp | 6 +++--- 2 files changed, 17 insertions(+), 3 deletions(-) create mode 100644 test/CXX/class/class.nest/p1-cxx0x.cpp (limited to 'test/CXX/class/class.nest') diff --git a/test/CXX/class/class.nest/p1-cxx0x.cpp b/test/CXX/class/class.nest/p1-cxx0x.cpp new file mode 100644 index 0000000..f8b06ac --- /dev/null +++ b/test/CXX/class/class.nest/p1-cxx0x.cpp @@ -0,0 +1,14 @@ +// RUN: %clang_cc1 -fsyntax-only -std=c++0x -verify %s + +class Outer { + int x; + static int sx; + int f(); + + // The first case is invalid in the C++03 mode but valid in C++0x (see 5.1.1.10). + class Inner { + static char a[sizeof(x)]; // okay + static char b[sizeof(sx)]; // okay + static char c[sizeof(f)]; // expected-error {{ call to non-static member function without an object argument }} + }; +}; diff --git a/test/CXX/class/class.nest/p1.cpp b/test/CXX/class/class.nest/p1.cpp index f1f5496..350cc81 100644 --- a/test/CXX/class/class.nest/p1.cpp +++ b/test/CXX/class/class.nest/p1.cpp @@ -3,12 +3,12 @@ class Outer { int x; static int sx; + int f(); - // C++0x will likely relax this rule in this specific case, but - // we'll still need to enforce it in C++03 mode. See N2253 (or - // successor). + // C++0x does relax this rule (see 5.1.1.10) in the first case, but we need to enforce it in C++03 mode. class Inner { static char a[sizeof(x)]; // expected-error {{ invalid use of nonstatic data member 'x' }} static char b[sizeof(sx)]; // okay + static char c[sizeof(f)]; // expected-error {{ call to non-static member function without an object argument }} }; }; -- cgit v1.1