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

Side by Side Diff: source/common/unicode/unistr.h

Issue 1317603003: Fix -Wmicrosoft-unqualified-friend warning. (Closed) Base URL: https://chromium.googlesource.com/chromium/deps/icu.git@master
Patch Set: . Created 5 years, 3 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 | « patches/stringthreadtest.patch ('k') | no next file » | 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) 1998-2013, International Business Machines 3 * Copyright (C) 1998-2013, International Business Machines
4 * Corporation and others. All Rights Reserved. 4 * Corporation and others. All Rights Reserved.
5 ********************************************************************** 5 **********************************************************************
6 * 6 *
7 * File unistr.h 7 * File unistr.h
8 * 8 *
9 * Modification History: 9 * Modification History:
10 * 10 *
(...skipping 16 matching lines...) Expand all
27 */ 27 */
28 28
29 #include "unicode/utypes.h" 29 #include "unicode/utypes.h"
30 #include "unicode/rep.h" 30 #include "unicode/rep.h"
31 #include "unicode/std_string.h" 31 #include "unicode/std_string.h"
32 #include "unicode/stringpiece.h" 32 #include "unicode/stringpiece.h"
33 #include "unicode/bytestream.h" 33 #include "unicode/bytestream.h"
34 #include "unicode/ucasemap.h" 34 #include "unicode/ucasemap.h"
35 35
36 struct UConverter; // unicode/ucnv.h 36 struct UConverter; // unicode/ucnv.h
37 class StringThreadTest;
38 37
39 #ifndef U_COMPARE_CODE_POINT_ORDER 38 #ifndef U_COMPARE_CODE_POINT_ORDER
40 /* see also ustring.h and unorm.h */ 39 /* see also ustring.h and unorm.h */
41 /** 40 /**
42 * Option bit for u_strCaseCompare, u_strcasecmp, unorm_compare, etc: 41 * Option bit for u_strCaseCompare, u_strcasecmp, unorm_compare, etc:
43 * Compare strings in code point order instead of code unit order. 42 * Compare strings in code point order instead of code unit order.
44 * @stable ICU 2.2 43 * @stable ICU 2.2
45 */ 44 */
46 #define U_COMPARE_CODE_POINT_ORDER 0x8000 45 #define U_COMPARE_CODE_POINT_ORDER 0x8000
47 #endif 46 #endif
(...skipping 3436 matching lines...) Expand 10 before | Expand all | Expand 10 after
3484 kOpenGetBuffer=16, // getBuffer(minCapacity) was called (is "open"), 3483 kOpenGetBuffer=16, // getBuffer(minCapacity) was called (is "open"),
3485 // and releaseBuffer(newLength) must be called 3484 // and releaseBuffer(newLength) must be called
3486 3485
3487 // combined values for convenience 3486 // combined values for convenience
3488 kShortString=kUsingStackBuffer, 3487 kShortString=kUsingStackBuffer,
3489 kLongString=kRefCounted, 3488 kLongString=kRefCounted,
3490 kReadonlyAlias=kBufferIsReadonly, 3489 kReadonlyAlias=kBufferIsReadonly,
3491 kWritableAlias=0 3490 kWritableAlias=0
3492 }; 3491 };
3493 3492
3494 friend class StringThreadTest;
3495 friend class UnicodeStringAppendable; 3493 friend class UnicodeStringAppendable;
3496 3494
3497 union StackBufferOrFields; // forward declaration necessary before frie nd declaration 3495 union StackBufferOrFields; // forward declaration necessary before frie nd declaration
3498 friend union StackBufferOrFields; // make US_STACKBUF_SIZE visible inside fUni on 3496 friend union StackBufferOrFields; // make US_STACKBUF_SIZE visible inside fUni on
3499 3497
3500 /* 3498 /*
3501 * The following are all the class fields that are stored 3499 * The following are all the class fields that are stored
3502 * in each UnicodeString object. 3500 * in each UnicodeString object.
3503 * Note that UnicodeString has virtual functions, 3501 * Note that UnicodeString has virtual functions,
3504 * therefore there is an implicit vtable pointer 3502 * therefore there is an implicit vtable pointer
(...skipping 956 matching lines...) Expand 10 before | Expand all | Expand 10 after
4461 { return doReverse(0, length()); } 4459 { return doReverse(0, length()); }
4462 4460
4463 inline UnicodeString& 4461 inline UnicodeString&
4464 UnicodeString::reverse(int32_t start, 4462 UnicodeString::reverse(int32_t start,
4465 int32_t _length) 4463 int32_t _length)
4466 { return doReverse(start, _length); } 4464 { return doReverse(start, _length); }
4467 4465
4468 U_NAMESPACE_END 4466 U_NAMESPACE_END
4469 4467
4470 #endif 4468 #endif
OLDNEW
« no previous file with comments | « patches/stringthreadtest.patch ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698