ICU-13103 drop old versions of U_IOSTREAM_SOURCE and __GNUC__
X-SVN-Rev: 40080
This commit is contained in:
parent
0ce89095fe
commit
ff5e1bfd6b
@ -330,31 +330,6 @@
|
||||
# define U_HAVE_INTTYPES_H U_HAVE_STDINT_H
|
||||
#endif
|
||||
|
||||
/**
|
||||
* \def U_IOSTREAM_SOURCE
|
||||
* Defines what support for C++ streams is available.
|
||||
*
|
||||
* If U_IOSTREAM_SOURCE is set to 199711, then <iostream> is available
|
||||
* (the ISO/IEC C++ FDIS was published in November 1997), and then
|
||||
* one should qualify streams using the std namespace in ICU header
|
||||
* files.
|
||||
* Starting with ICU 49, this is the only supported version.
|
||||
*
|
||||
* If U_IOSTREAM_SOURCE is set to 198506, then <iostream.h> is
|
||||
* available instead (in June 1985 Stroustrup published
|
||||
* "An Extensible I/O Facility for C++" at the summer USENIX conference).
|
||||
* Starting with ICU 49, this version is not supported any more.
|
||||
*
|
||||
* If U_IOSTREAM_SOURCE is 0 (or any value less than 199711),
|
||||
* then C++ streams are not available and
|
||||
* support for them will be silently suppressed in ICU.
|
||||
*
|
||||
* @internal
|
||||
*/
|
||||
#ifndef U_IOSTREAM_SOURCE
|
||||
#define U_IOSTREAM_SOURCE 199711
|
||||
#endif
|
||||
|
||||
/*===========================================================================*/
|
||||
/** @{ Compiler and environment features */
|
||||
/*===========================================================================*/
|
||||
|
@ -34,13 +34,7 @@
|
||||
namespace std { class type_info; } // WORKAROUND: http://llvm.org/bugs/show_bug.cgi?id=13364
|
||||
#endif
|
||||
|
||||
#if U_IOSTREAM_SOURCE >= 199711
|
||||
#if (__GNUC__ == 2)
|
||||
#include <iostream>
|
||||
#else
|
||||
#include <istream>
|
||||
#include <ostream>
|
||||
#endif
|
||||
|
||||
U_NAMESPACE_BEGIN
|
||||
|
||||
@ -67,4 +61,3 @@ U_NAMESPACE_END
|
||||
/* No operator for UChar because it can conflict with wchar_t */
|
||||
|
||||
#endif
|
||||
#endif
|
||||
|
@ -29,8 +29,6 @@
|
||||
|
||||
// console IO
|
||||
|
||||
#if U_IOSTREAM_SOURCE >= 199711
|
||||
|
||||
#define STD_NAMESPACE std::
|
||||
|
||||
#define STD_OSTREAM STD_NAMESPACE ostream
|
||||
@ -170,4 +168,3 @@ STOP_READING:
|
||||
U_NAMESPACE_END
|
||||
|
||||
#endif
|
||||
#endif
|
||||
|
@ -194,7 +194,7 @@ void TestMessageFormat::testBug2()
|
||||
}
|
||||
|
||||
#if 0
|
||||
#if defined(_DEBUG) && U_IOSTREAM_SOURCE >= 199711
|
||||
#if defined(_DEBUG)
|
||||
//----------------------------------------------------
|
||||
// console I/O
|
||||
//----------------------------------------------------
|
||||
@ -245,7 +245,7 @@ operator<<( IntlTest& stream,
|
||||
}
|
||||
return stream;
|
||||
}
|
||||
#endif /* defined(_DEBUG) && U_IOSTREAM_SOURCE >= 199711 */
|
||||
#endif /* defined(_DEBUG) */
|
||||
#endif
|
||||
|
||||
void TestMessageFormat::PatternTest()
|
||||
|
@ -698,9 +698,7 @@ static void addAllTests(TestNode** root) {
|
||||
addTest(root, &DataDrivenPrintfPrecision, "datadriv/DataDrivenPrintfPrecision");
|
||||
addTest(root, &DataDrivenScanf, "datadriv/DataDrivenScanf");
|
||||
#endif
|
||||
#if U_IOSTREAM_SOURCE >= 199711
|
||||
addStreamTests(root);
|
||||
#endif
|
||||
}
|
||||
|
||||
/* returns the path to icu/source/data/out */
|
||||
|
@ -23,7 +23,6 @@
|
||||
#include "cmemory.h"
|
||||
#include "iotest.h"
|
||||
|
||||
#if U_IOSTREAM_SOURCE >= 199711
|
||||
#if defined(__GNUC__) && __GNUC__ >= 4
|
||||
#define USE_SSTREAM 1
|
||||
#include <sstream>
|
||||
@ -322,4 +321,3 @@ U_CFUNC void addStreamTests(TestNode** root) {
|
||||
addTest(root, &TestStream, "stream/TestStream");
|
||||
addTest(root, &TestStreamEOF, "stream/TestStreamEOF");
|
||||
}
|
||||
#endif
|
||||
|
Loading…
Reference in New Issue
Block a user