diff options
author | Rouslan Solomakhin <rouslan@chromium.org> | 2014-05-14 11:59:48 +0000 |
---|---|---|
committer | Fredrik Roubert <roubert@google.com> | 2014-09-01 19:20:43 +0200 |
commit | e80658e45a50333ddf39b5ae66594dbc063d97f9 (patch) | |
tree | a70436c014aac15a19374728860d2de8715924a2 /cpp/src/address_ui.cc | |
parent | 3981646185d4be18e454910da21cf16591ac1c9e (diff) | |
download | src-e80658e45a50333ddf39b5ae66594dbc063d97f9.tar.gz |
Do not compare format::iterator to rule.GetFormat()::iterator.
BuildComponents() iterates over elements of "format" and compares the
iterator to "rule.GetFormat()", which may be a different container
from "format".
Diffstat (limited to 'cpp/src/address_ui.cc')
-rw-r--r-- | cpp/src/address_ui.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cpp/src/address_ui.cc b/cpp/src/address_ui.cc index 0eb28fc..391cf65 100644 --- a/cpp/src/address_ui.cc +++ b/cpp/src/address_ui.cc @@ -156,7 +156,7 @@ std::vector<AddressUiComponent> BuildComponents( AddressUiComponent component; std::vector<AddressField>::const_iterator next_field_it = field_it + 1; next_field_is_newline = - next_field_it == rule.GetFormat().end() || IsNewline(*next_field_it); + next_field_it == format.end() || IsNewline(*next_field_it); component.length_hint = previous_field_is_newline && next_field_is_newline ? AddressUiComponent::HINT_LONG : AddressUiComponent::HINT_SHORT; |