diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2021-06-07 21:23:38 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-07 21:23:38 +0200 |
| commit | f8d348ca352579461659e5e58fccfd6cb57a83b2 (patch) | |
| tree | 63a2e64057541d7f9d7cd273c617cd83924f2a56 /ACE/ace/config-win32-msvc-14.h | |
| parent | 072c0939cc2a824ced1fb3ab7091b74c3bb092c3 (diff) | |
| download | ATCD-f8d348ca352579461659e5e58fccfd6cb57a83b2.tar.gz | |
Update config-win32-msvc-14.h
Diffstat (limited to 'ACE/ace/config-win32-msvc-14.h')
| -rw-r--r-- | ACE/ace/config-win32-msvc-14.h | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/ACE/ace/config-win32-msvc-14.h b/ACE/ace/config-win32-msvc-14.h index 4cdd59b7226..41bc784d45f 100644 --- a/ACE/ace/config-win32-msvc-14.h +++ b/ACE/ace/config-win32-msvc-14.h @@ -72,22 +72,15 @@ #define ACE_LACKS_LINEBUFFERED_STREAMBUF // ace/iostream.h does not work with the standard cpp library (yet). -# if !defined (ACE_USES_OLD_IOSTREAMS) +#if !defined (ACE_USES_OLD_IOSTREAMS) # define ACE_LACKS_ACE_IOSTREAM -# endif /* ! ACE_USES_OLD_IOSTREAMS */ - -#else - -// iostream header lacks ipfx (), isfx (), etc., declarations -# define ACE_LACKS_IOSTREAM_FX - -#endif +#endif /* ! ACE_USES_OLD_IOSTREAMS */ // There are too many instances of this warning to fix it right now. // Maybe in the future. // Disable warning of using Microsoft Extension. -# pragma warning(disable:4231) +#pragma warning(disable:4231) // 'class1' : inherits 'class2::member' via dominance #pragma warning(disable:4250) |