diff options
| author | Johnny Willemsen <jwillemsen@users.noreply.github.com> | 2016-10-31 12:13:20 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-31 12:13:20 +0100 |
| commit | bd5aaab0e6022781ff8fdb383ea75ae3ecc3b17d (patch) | |
| tree | 215b87a96310aeef290fd8d6aaf538a8bb183374 /ACE/ace/config-macros.h | |
| parent | fdc242fcb81d6ab5893d462364b50632241afdf4 (diff) | |
| parent | 4bb4047e520cd551b7d9bf0a1079103b68e3bf7d (diff) | |
| download | ATCD-bd5aaab0e6022781ff8fdb383ea75ae3ecc3b17d.tar.gz | |
Merge pull request #176 from esohns/master
some (bundled) minor changes (take 2)
Diffstat (limited to 'ACE/ace/config-macros.h')
| -rw-r--r-- | ACE/ace/config-macros.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/ACE/ace/config-macros.h b/ACE/ace/config-macros.h index 2fae4892abd..b1d859fff71 100644 --- a/ACE/ace/config-macros.h +++ b/ACE/ace/config-macros.h @@ -49,7 +49,11 @@ # if defined (ACE_LACKS_IOSTREAM_TOTALLY) # define ACE_OSTREAM_TYPE FILE # else /* ! ACE_LACKS_IOSTREAM_TOTALLY */ +# if defined ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB +# define ACE_OSTREAM_TYPE std::ostream +# else # define ACE_OSTREAM_TYPE ostream +# endif /* ! ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB */ # endif /* ! ACE_LACKS_IOSTREAM_TOTALLY */ #endif /* ! ACE_OSTREAM_TYPE */ |