diff options
| author | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2011-06-17 16:52:12 +0000 |
|---|---|---|
| committer | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2011-06-17 16:52:12 +0000 |
| commit | dd5cc92cd63bc66f589681db965bd706c466b073 (patch) | |
| tree | 1173185071def1902c7bc6fe22e04d6f798ce493 | |
| parent | 56bc7c28477583e84ee0622ed1292e32a86f5695 (diff) | |
| download | ATCD-dd5cc92cd63bc66f589681db965bd706c466b073.tar.gz | |
ChangeLogTag: Fri Jun 17 16:48:29 UTC 2011 Jeff Parsons <j.parsons@vanderbilt.edu>
| -rw-r--r-- | ACE/ChangeLog | 8 | ||||
| -rw-r--r-- | ACE/ace/Basic_Types.h | 10 |
2 files changed, 15 insertions, 3 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index 373482dc642..7507677527f 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,11 @@ +Fri Jun 17 16:48:29 UTC 2011 Jeff Parsons <j.parsons@vanderbilt.edu> + + * ace/Basic_Types.h: + + Another tweak to ACE_LONG_DOUBLE_FORMAT_SPECIFIER_ASCII's + conditional definition to eliminate warnings on FC12 + and FC15. + Fri Jun 17 12:48:31 UTC 2011 Jeff Parsons <j.parsons@vanderbilt.edu> * ace/Basic_Types.h: diff --git a/ACE/ace/Basic_Types.h b/ACE/ace/Basic_Types.h index 613a74ff926..dae58caae71 100644 --- a/ACE/ace/Basic_Types.h +++ b/ACE/ace/Basic_Types.h @@ -835,12 +835,16 @@ ACE_END_VERSIONED_NAMESPACE_DECL #if !defined (ACE_LONG_DOUBLE_FORMAT_SPECIFIER_ASCII) # if defined (ACE_CDR_IMPLEMENT_WITH_NATIVE_DOUBLE) && \ (ACE_CDR_IMPLEMENT_WITH_NATIVE_DOUBLE == 1) -# define ACE_LONG_DOUBLE_FORMAT_SPECIFIER_ASCII "%#24.16G" +# if defined (NONNATIVE_LONGDOUBLE) +# define ACE_LONG_DOUBLE_FORMAT_SPECIFIER_ASCII "%#24.16G" +# else +# define ACE_LONG_DOUBLE_FORMAT_SPECIFIER_ASCII "#24.16LG" +# endif /* defined (NONNATIVE_LONGDOUBLE) */ # else # if defined (__MINGW32__) -# define ACE_LONG_DOUBLE_FORMAT_SPECIFIER_ASCII "%24.16G" +# define ACE_LONG_DOUBLE_FORMAT_SPECIFIER_ASCII "%24.16G" # else -# define ACE_LONG_DOUBLE_FORMAT_SPECIFIER_ASCII "%#24.16LGL" +# define ACE_LONG_DOUBLE_FORMAT_SPECIFIER_ASCII "%#24.16LGL" # endif /* __MINGW32__ */ # endif /* ACE_CDR_IMPLEMENT_WITH_NATIVE_DOUBLE */ #endif /* ACE_LONG_DOUBLE_FORMAT_SPECIFIER_ASCII */ |