diff options
| -rw-r--r-- | clang/test/Modules/Inputs/merge-using-decls/b.h | 4 | ||||
| -rw-r--r-- | clang/test/Modules/merge-using-decls.cpp | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/clang/test/Modules/Inputs/merge-using-decls/b.h b/clang/test/Modules/Inputs/merge-using-decls/b.h index 5bad68d2d5f..5d112ffbfe9 100644 --- a/clang/test/Modules/Inputs/merge-using-decls/b.h +++ b/clang/test/Modules/Inputs/merge-using-decls/b.h @@ -29,7 +29,7 @@ template<typename T> struct D : X, T { using typename X::t; }; -#if __cplusplus <= 199711L // C++11 does not allow access declerations +#if __cplusplus <= 199711L // C++11 does not allow access declarations template<typename T> struct E : X, T { // Mismatch in using/access-declaration-ness. T::value; @@ -49,7 +49,7 @@ template<typename T> struct F : X, T { typedef C<YB>::type I; typedef D<YBRev>::t I; -#if __cplusplus <= 199711L // C++11 does not allow access declerations +#if __cplusplus <= 199711L // C++11 does not allow access declarations typedef E<YB>::type I; #endif diff --git a/clang/test/Modules/merge-using-decls.cpp b/clang/test/Modules/merge-using-decls.cpp index 019a69fe25f..1ec9a9a17bd 100644 --- a/clang/test/Modules/merge-using-decls.cpp +++ b/clang/test/Modules/merge-using-decls.cpp @@ -28,7 +28,7 @@ template<typename T> int Use() { } template<typename T> int UseAll() { -#if __cplusplus <= 199711L // C++11 does not allow access declerations +#if __cplusplus <= 199711L // C++11 does not allow access declarations return Use<C<T> >() + Use<D<T> >() + Use<E<T> >() + Use<F<T> >(); // expected-note 0-2{{instantiation of}} #else return Use<C<T> >() + Use<D<T> >() + Use<F<T> >(); // expected-note 0-2{{instantiation of}} @@ -45,7 +45,7 @@ template int UseAll<Y>(); // Here, we're instantiating the definition from 'A' and merging the definition // from 'B' into it. -#if __cplusplus <= 199711L // C++11 does not allow access declerations +#if __cplusplus <= 199711L // C++11 does not allow access declarations // expected-error@b.h:* {{'E::value' from module 'B' is not present in definition of 'E<T>' in module 'A'}} // expected-error@b.h:* {{'E::v' from module 'B' is not present in definition of 'E<T>' in module 'A'}} #endif @@ -65,7 +65,7 @@ template int UseAll<Y>(); // expected-error@b.h:* 2{{'typename' keyword used on a non-type}} // expected-error@b.h:* 2{{dependent using declaration resolved to type without 'typename'}} -#if __cplusplus <= 199711L // C++11 does not allow access declerations +#if __cplusplus <= 199711L // C++11 does not allow access declarations // expected-error@a.h:* {{'E::type' from module 'A' is not present in definition of 'E<T>' in module 'B'}} // expected-error@a.h:* {{'E::t' from module 'A' is not present in definition of 'E<T>' in module 'B'}} // expected-error@a.h:* {{'E::value' from module 'A' is not present in definition of 'E<T>' in module 'B'}} |
