summaryrefslogtreecommitdiffstats
path: root/clang/test/CXX/temp/temp.spec/temp.expl.spec/examples.cpp
diff options
context:
space:
mode:
authorLarisse Voufo <lvoufo@google.com>2013-08-14 03:09:19 +0000
committerLarisse Voufo <lvoufo@google.com>2013-08-14 03:09:19 +0000
commitd8dd97c0a278ad685efaabc52f14acf4fd1bae6e (patch)
tree6750d927046c898752fdef510798ea8ca92a0d42 /clang/test/CXX/temp/temp.spec/temp.expl.spec/examples.cpp
parentdb2162903e02073e62a6265404977024fe16dfa1 (diff)
downloadbcm5719-llvm-d8dd97c0a278ad685efaabc52f14acf4fd1bae6e.tar.gz
bcm5719-llvm-d8dd97c0a278ad685efaabc52f14acf4fd1bae6e.zip
Bug fix: disallow a variable template to be redeclared as a non-templated variable
llvm-svn: 188350
Diffstat (limited to 'clang/test/CXX/temp/temp.spec/temp.expl.spec/examples.cpp')
-rw-r--r--clang/test/CXX/temp/temp.spec/temp.expl.spec/examples.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/clang/test/CXX/temp/temp.spec/temp.expl.spec/examples.cpp b/clang/test/CXX/temp/temp.spec/temp.expl.spec/examples.cpp
index 3844ec99458..d12feeff0bb 100644
--- a/clang/test/CXX/temp/temp.spec/temp.expl.spec/examples.cpp
+++ b/clang/test/CXX/temp/temp.spec/temp.expl.spec/examples.cpp
@@ -163,8 +163,7 @@ namespace PR9877 {
template<> struct X<1>::Y { static const int Z = 1; };
const int X<0>::Y::Z;
- template<> const int X<1>::Y::Z; // expected-error{{extraneous 'template<>' in declaration of variable 'Z'}} \
- // expected-error{{forward declaration of variable template cannot have a nested name specifier}}
+ template<> const int X<1>::Y::Z; // expected-error{{extraneous 'template<>' in declaration of variable 'Z'}}
}
namespace PR9913 {
OpenPOWER on IntegriCloud