Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(137)

Side by Side Diff: source/io/unicode/ustream.h

Issue 845603002: Update ICU to 54.1 step 1 (Closed) Base URL: https://chromium.googlesource.com/chromium/deps/icu.git@master
Patch Set: remove unusued directories Created 5 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « source/io/unicode/ustdio.h ('k') | source/io/uprintf.c » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 ********************************************************************** 2 **********************************************************************
3 * Copyright (C) 2001-2011 International Business Machines 3 * Copyright (C) 2001-2014 International Business Machines
4 * Corporation and others. All Rights Reserved. 4 * Corporation and others. All Rights Reserved.
5 ********************************************************************** 5 **********************************************************************
6 * FILE NAME : ustream.h 6 * FILE NAME : ustream.h
7 * 7 *
8 * Modification History: 8 * Modification History:
9 * 9 *
10 * Date Name Description 10 * Date Name Description
11 * 06/25/2001 grhoten Move iostream from unistr.h 11 * 06/25/2001 grhoten Move iostream from unistr.h
12 ****************************************************************************** 12 ******************************************************************************
13 */ 13 */
14 14
15 #ifndef USTREAM_H 15 #ifndef USTREAM_H
16 #define USTREAM_H 16 #define USTREAM_H
17 17
18 #include "unicode/unistr.h" 18 #include "unicode/unistr.h"
19 19
20 #if !UCONFIG_NO_CONVERSION // not available without conversion
21
20 /** 22 /**
21 * \file 23 * \file
22 * \brief C++ API: Unicode iostream like API 24 * \brief C++ API: Unicode iostream like API
23 * 25 *
24 * At this time, this API is very limited. It contains 26 * At this time, this API is very limited. It contains
25 * operator<< and operator>> for UnicodeString manipulation with the 27 * operator<< and operator>> for UnicodeString manipulation with the
26 * C++ I/O stream API. 28 * C++ I/O stream API.
27 */ 29 */
28 30
31 #if !defined(_MSC_VER)
32 namespace std { class type_info; } // WORKAROUND: http://llvm.org/bugs/show_bug. cgi?id=13364
33 #endif
34
29 #if U_IOSTREAM_SOURCE >= 199711 35 #if U_IOSTREAM_SOURCE >= 199711
30 #if (__GNUC__ == 2) 36 #if (__GNUC__ == 2)
31 #include <iostream> 37 #include <iostream>
32 #else 38 #else
33 #include <istream> 39 #include <istream>
34 #include <ostream> 40 #include <ostream>
35 #endif 41 #endif
36 42
37 U_NAMESPACE_BEGIN 43 U_NAMESPACE_BEGIN
38 44
(...skipping 13 matching lines...) Expand all
52 * @stable 3.0 58 * @stable 3.0
53 */ 59 */
54 U_IO_API std::istream & U_EXPORT2 operator>>(std::istream& stream, UnicodeString & s); 60 U_IO_API std::istream & U_EXPORT2 operator>>(std::istream& stream, UnicodeString & s);
55 U_NAMESPACE_END 61 U_NAMESPACE_END
56 62
57 #endif 63 #endif
58 64
59 /* No operator for UChar because it can conflict with wchar_t */ 65 /* No operator for UChar because it can conflict with wchar_t */
60 66
61 #endif 67 #endif
68 #endif
OLDNEW
« no previous file with comments | « source/io/unicode/ustdio.h ('k') | source/io/uprintf.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698