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

Side by Side Diff: source/io/ustream.cpp

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/ustdio.c ('k') | source/runConfigureICU » ('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.cpp 6 * FILE NAME : ustream.cpp
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 to here 11 * 06/25/2001 grhoten Move iostream from unistr.h to here
12 ****************************************************************************** 12 ******************************************************************************
13 */ 13 */
14 14
15 #include "unicode/utypes.h" 15 #include "unicode/utypes.h"
16
17 #if !UCONFIG_NO_CONVERSION
18
16 #include "unicode/uobject.h" 19 #include "unicode/uobject.h"
17 #include "unicode/ustream.h" 20 #include "unicode/ustream.h"
18 #include "unicode/ucnv.h" 21 #include "unicode/ucnv.h"
19 #include "unicode/uchar.h" 22 #include "unicode/uchar.h"
20 #include "unicode/utf16.h" 23 #include "unicode/utf16.h"
21 #include "ustr_cnv.h" 24 #include "ustr_cnv.h"
22 #include "cmemory.h" 25 #include "cmemory.h"
23 #include <string.h> 26 #include <string.h>
24 27
25 // console IO 28 // console IO
(...skipping 132 matching lines...) Expand 10 before | Expand all | Expand 10 after
158 u_releaseDefaultConverter(converter); 161 u_releaseDefaultConverter(converter);
159 } 162 }
160 163
161 /* stream.flush();*/ 164 /* stream.flush();*/
162 return stream; 165 return stream;
163 } 166 }
164 167
165 U_NAMESPACE_END 168 U_NAMESPACE_END
166 169
167 #endif 170 #endif
171 #endif
OLDNEW
« no previous file with comments | « source/io/ustdio.c ('k') | source/runConfigureICU » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698