patches/changeset_30255.patch - Issue 9425042: ICU: Merge upstream r30255 to fix a clang warning.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: patches/changeset_30255.patch

Issue 9425042: ICU: Merge upstream r30255 to fix a clang warning. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/deps/third_party/icu46/

Patch Set: Created 8 years, 10 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:

OLD	NEW
(Empty)
	1 Index: /icu/trunk/source/common/rbbi.cpp

	2 ===================================================================

	3 --- /icu/trunk/source/common/rbbi.cpp (revision 30203)

	4 +++ /icu/trunk/source/common/rbbi.cpp (revision 30255)

	5 @@ -1566,17 +1566,6 @@

	6 //

	7 // Clone the source BI into the caller-supplied buffer.

	8 - // TODO: using an overloaded operator new to directly initialize the

	9 - // copy in the user's buffer would be better, but it doesn't seem

	10 - // to get along with namespaces. Investigate why.

	11 //

	12 - // The memcpy is only safe with an empty (default constructed)

	13 - // break iterator. Use on others can screw up reference counts

	14 - // to data. memcpy-ing objects is not really a good idea...

	15 - //

	16 - RuleBasedBreakIterator localIter; // Empty break iterator, source fo r memcpy

	17 - RuleBasedBreakIterator clone = (RuleBasedBreakIterator )buf;

	18 - uprv_memcpy(clone, &localIter, sizeof(RuleBasedBreakIterator)); // init C++ gorp, BreakIterator base class part

	19 - clone->init(); // Init RuleBasedBreakIterator part, (user de fault constructor)

	20 - clone = this; // clone = the real BI we want.

	21 + RuleBasedBreakIterator clone = new(buf) RuleBasedBreakIterator(this);

	22 clone->fBufferClone = TRUE; // Flag to prevent deleting storage on close (From C code)

OLD	NEW

« no previous file with comments | « README.chromium ('k') | source/common/rbbi.cpp » ('j') | no next file with comments »