r216969 - Avoid test failure on platforms where size_t is long long (and thus can't be

[Jordan Rose]

Eh? When is "long long" not a valid C++ type?

> On Sep 2, 2014, at 14:39, Richard Smith <richard-llvm at metafoo.co.uk> wrote:
> 
> Author: rsmith
> Date: Tue Sep  2 16:39:21 2014
> New Revision: 216969
> 
> URL: http://llvm.org/viewvc/llvm-project?rev=216969&view=rev
> Log:
> Avoid test failure on platforms where size_t is long long (and thus can't be
> directly written in strictly-conforming source code).
> 
> Modified:
>    cfe/trunk/test/CXX/drs/dr5xx.cpp
> 
> Modified: cfe/trunk/test/CXX/drs/dr5xx.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CXX/drs/dr5xx.cpp?rev=216969&r1=216968&r2=216969&view=diff
> ==============================================================================
> --- cfe/trunk/test/CXX/drs/dr5xx.cpp (original)
> +++ cfe/trunk/test/CXX/drs/dr5xx.cpp Tue Sep  2 16:39:21 2014
> @@ -5,7 +5,8 @@
> // FIXME: This is included to avoid a diagnostic with no source location
> // pointing at the implicit operator new. We can't match such a diagnostic
> // with -verify.
> -void *operator new(__SIZE_TYPE__); // expected-warning 0-1{{missing exception spec}} expected-note{{candidate}}
> +__extension__ typedef __SIZE_TYPE__ size_t;
> +void *operator new(size_t); // expected-warning 0-1{{missing exception spec}} expected-note{{candidate}}
> 
> namespace dr500 { // dr500: dup 372
>   class D;
> @@ -564,7 +565,7 @@ namespace dr552 { // dr552: yes
> }
> 
> struct dr553_class {
> -  friend void *operator new(__SIZE_TYPE__, dr553_class);
> +  friend void *operator new(size_t, dr553_class);
> };
> namespace dr553 {
>   dr553_class c;
> @@ -574,7 +575,7 @@ namespace dr553 {
>   void *p = new (c) int; // expected-error {{no matching function}}
> 
>   struct namespace_scope {
> -    friend void *operator new(__SIZE_TYPE__, namespace_scope); // expected-error {{cannot be declared inside a namespace}}
> +    friend void *operator new(size_t, namespace_scope); // expected-error {{cannot be declared inside a namespace}}
>   };
> }
> 
> 
> 
> _______________________________________________
> cfe-commits mailing list
> cfe-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits