diff options
| author | froydnj <froydnj@138bc75d-0d04-0410-961f-82ee72b054a4> | 2010-11-15 15:24:31 +0000 |
|---|---|---|
| committer | froydnj <froydnj@138bc75d-0d04-0410-961f-82ee72b054a4> | 2010-11-15 15:24:31 +0000 |
| commit | 597d2d811007e58b04b4d88b37fed089e03ddaeb (patch) | |
| tree | 6e418dc0ff807b9ab6f27b6df17a998720393508 /gcc/c-family | |
| parent | 4b65cd43509d1a181d0c6a6e233f29f288c06a7d (diff) | |
| download | gcc-597d2d811007e58b04b4d88b37fed089e03ddaeb.tar.gz | |
gcc/c-family/
PR preprocessor/45038
* c-cppbuiltin.c (c_cpp_builtins): Use different format for C++
dialects.
gcc/testsuite/
PR preprocessor/45038
* g++.dg/pr45038.C: New test.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@166756 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/c-family')
| -rw-r--r-- | gcc/c-family/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/c-family/c-cppbuiltin.c | 10 |
2 files changed, 13 insertions, 3 deletions
diff --git a/gcc/c-family/ChangeLog b/gcc/c-family/ChangeLog index bb0472e2957..4e31d6a1e18 100644 --- a/gcc/c-family/ChangeLog +++ b/gcc/c-family/ChangeLog @@ -1,3 +1,9 @@ +2010-11-15 Nathan Froyd <froydnj@codesourcery.com> + + PR preprocessor/45038 + * c-cppbuiltin.c (c_cpp_builtins): Use different format for C++ + dialects. + 2010-11-12 Joseph Myers <joseph@codesourcery.com> * c-common.h (c_family_lang_mask): Declare. diff --git a/gcc/c-family/c-cppbuiltin.c b/gcc/c-family/c-cppbuiltin.c index 7b5a14dda11..ca779648b20 100644 --- a/gcc/c-family/c-cppbuiltin.c +++ b/gcc/c-family/c-cppbuiltin.c @@ -657,9 +657,13 @@ c_cpp_builtins (cpp_reader *pfile) /* Cast the double precision constants. This is needed when single precision constants are specified or when pragma FLOAT_CONST_DECIMAL64 is used. The correct result is computed by the compiler when using - macros that include a cast. */ - builtin_define_float_constants ("DBL", "L", "((double)%s)", "", - double_type_node); + macros that include a cast. We use a different cast for C++ to avoid + problems with -Wold-style-cast. */ + builtin_define_float_constants ("DBL", "L", + (c_dialect_cxx () + ? "double(%s)" + : "((double)%s)"), + "", double_type_node); builtin_define_float_constants ("LDBL", "L", "%s", "L", long_double_type_node); |