maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

In stdbool.h, define bool, false, true only in gnu++98 

GCC has meanwhile corrected that with the similar
<https://gcc.gnu.org/viewcvs/gcc?view=revision&revision=216679> "C++11
explicitly forbids macros for bool, true and false."

Differential Revision: https://reviews.llvm.org/D40167

llvm-svn: 320135
This commit is contained in:
Stephan Bergmann 2017-12-08 08:28:08 +00:00
parent 037115c29f
commit feed26ff07
2 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
clang/lib/Headers/stdbool.h
View File

@ -32,12 +32,15 @@
#define true 1 #define true 1
#define false 0 #define false 0
#elif defined(__GNUC__) && !defined(__STRICT_ANSI__) #elif defined(__GNUC__) && !defined(__STRICT_ANSI__)
/* Define _Bool, bool, false, true as a GNU extension. */ /* Define _Bool as a GNU extension. */
#define _Bool bool #define _Bool bool
#if __cplusplus < 201103L
/* For C++98, define bool, false, true as a GNU extension. */
#define bool bool #define bool bool
#define false false #define false false
#define true true #define true true
#endif #endif
#endif
#define __bool_true_false_are_defined 1 #define __bool_true_false_are_defined 1

16
clang/test/Headers/stdbool.cpp
View File

@ -1,13 +1,19 @@
// RUN: %clang_cc1 -E -dM %s | FileCheck --check-prefix=CHECK-GNU-COMPAT %s // RUN: %clang_cc1 -std=gnu++98 -E -dM %s | FileCheck --check-prefix=CHECK-GNU-COMPAT-98 %s
// RUN: %clang_cc1 -std=gnu++11 -E -dM %s | FileCheck --check-prefix=CHECK-GNU-COMPAT-11 %s
// RUN: %clang_cc1 -std=c++98 -E -dM %s | FileCheck --check-prefix=CHECK-CONFORMING %s // RUN: %clang_cc1 -std=c++98 -E -dM %s | FileCheck --check-prefix=CHECK-CONFORMING %s
// RUN: %clang_cc1 -fsyntax-only -std=gnu++98 -verify -Weverything %s // RUN: %clang_cc1 -fsyntax-only -std=gnu++98 -verify -Weverything %s
#include <stdbool.h> #include <stdbool.h>
#define zzz #define zzz
// CHECK-GNU-COMPAT: #define _Bool bool // CHECK-GNU-COMPAT-98: #define _Bool bool
// CHECK-GNU-COMPAT: #define bool bool // CHECK-GNU-COMPAT-98: #define bool bool
// CHECK-GNU-COMPAT: #define false false // CHECK-GNU-COMPAT-98: #define false false
// CHECK-GNU-COMPAT: #define true true // CHECK-GNU-COMPAT-98: #define true true
// CHECK-GNU-COMPAT-11: #define _Bool bool
// CHECK-GNU-COMPAT-11-NOT: #define bool bool
// CHECK-GNU-COMPAT-11-NOT: #define false false
// CHECK-GNU-COMPAT-11-NOT: #define true true
// CHECK-CONFORMING-NOT: #define _Bool // CHECK-CONFORMING-NOT: #define _Bool
// CHECK-CONFORMING: #define __CHAR_BIT__ // CHECK-CONFORMING: #define __CHAR_BIT__