diff options
author | maximius <none@none> | 2009-10-17 15:51:44 -0700 |
---|---|---|
committer | maximius <none@none> | 2009-10-17 15:51:44 -0700 |
commit | e585187b248f48b3c6e9247b49fa07c6565d65e5 (patch) | |
tree | 637c5b7ddacf41040bef4ea4f75a97da64c6a9bc /dep/ACE_wrappers/ace/streams.h | |
parent | 26b5e033ffde3d161382fc9addbfa99738379641 (diff) |
*Backed out changeset 3be01fb200a5
--HG--
branch : trunk
Diffstat (limited to 'dep/ACE_wrappers/ace/streams.h')
-rw-r--r-- | dep/ACE_wrappers/ace/streams.h | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/dep/ACE_wrappers/ace/streams.h b/dep/ACE_wrappers/ace/streams.h index 68c007d30a7..2b3ae4390fa 100644 --- a/dep/ACE_wrappers/ace/streams.h +++ b/dep/ACE_wrappers/ace/streams.h @@ -1,4 +1,5 @@ // -*- C++ -*- + //============================================================================= /** * @file streams.h @@ -17,26 +18,34 @@ */ //============================================================================= + #ifndef ACE_STREAMS_H #define ACE_STREAMS_H #include /**/ "ace/pre.h" + #include /**/ "ace/config-all.h" + #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ + // Do this so the #pragma warning in the MSVC headers do not // affect our #pragma warning settings #if defined (_MSC_VER) #pragma warning(push) #endif /* _MSC_VER*/ + #if !defined (ACE_LACKS_IOSTREAM_TOTALLY) + # if defined (ACE_HAS_STANDARD_CPP_LIBRARY) && \ (ACE_HAS_STANDARD_CPP_LIBRARY != 0) + # if defined (_MSC_VER) # pragma warning(disable: 4018 4114 4146 4245) # pragma warning(disable: 4663 4664 4665 4511 4512) # endif /* _MSC_VER */ + # if defined (ACE_USES_OLD_IOSTREAMS) # include /**/ <iostream.h> # include /**/ <fstream.h> @@ -54,8 +63,10 @@ # include /**/ <iomanip> # include /**/ <ios> # endif /* ACE_USES_OLD_IOSTREAMS */ + # if defined (ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB) && \ (ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB != 0) + # if !defined (ACE_USES_OLD_IOSTREAMS) // Make these available in the global name space using std::ios; @@ -68,32 +79,42 @@ using std::ifstream; using std::ofstream; using std::fstream; + using std::cin; using std::cout; using std::cerr; using std::clog; + using std::endl; using std::ends; using std::flush; + using std::ws; + using std::resetiosflags; using std::setfill; using std::setiosflags; using std::setprecision; using std::setw; + using std::dec; using std::hex; using std::oct; # endif /* ! ACE_USES_OLD_IOSTREAMS */ + # endif /* ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB */ + # if defined (_MSC_VER) # pragma warning(4: 4018 4114 4146 4245) # pragma warning(4: 4663 4664 4665 4512 4511) # endif /* _MSC_VER */ + # else /* ! ACE_HAS_STANDARD_CPP_LIBRARY */ + # include /**/ <fstream.h> # include /**/ <iostream.h> # include /**/ <iomanip.h> + # if defined (ACE_WIN32) && !defined(__MINGW32__) # if defined(_MSC_VER) // VSB # include /**/ <ios.h> @@ -102,13 +123,17 @@ # include /**/ <ostream.h> # endif /* _MSC_VER */ # endif /* ACE_WIN32 && !__MINGW32__ */ + # endif /* ! ACE_HAS_STANDARD_CPP_LIBRARY */ + #endif /* ! ACE_LACKS_IOSTREAM_TOTALLY */ + // Do this so the #pragma warning in the MSVC headers do not // affect our #pragma warning settings #if defined (_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ + #include /**/ "ace/post.h" #endif /* ACE_STREAMS_H */ |