diff options
author | Jon Skeet <skeet@pobox.com> | 2015-07-21 12:58:43 +0100 |
---|---|---|
committer | Jon Skeet <skeet@pobox.com> | 2015-07-21 12:58:43 +0100 |
commit | 2ee4b5665520fe3245eb5e15df8bd35e0c539a07 (patch) | |
tree | f5e81c7ea4d414c6a388ebc86ab62175240660d1 /examples/list_people.cc | |
parent | c792db5d0878871d8f2f78cf12c7e597060088c8 (diff) | |
parent | 353b7a99857442c7c64a56111b3910b63237ccc8 (diff) | |
download | protobuf-2ee4b5665520fe3245eb5e15df8bd35e0c539a07.tar.gz protobuf-2ee4b5665520fe3245eb5e15df8bd35e0c539a07.tar.bz2 protobuf-2ee4b5665520fe3245eb5e15df8bd35e0c539a07.zip |
Merge pull request #629 from google/master
Integrate changes from upstream/master into csharp-experimental
Diffstat (limited to 'examples/list_people.cc')
-rw-r--r-- | examples/list_people.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/examples/list_people.cc b/examples/list_people.cc index 5363152e..68e5666d 100644 --- a/examples/list_people.cc +++ b/examples/list_people.cc @@ -8,17 +8,17 @@ using namespace std; // Iterates though all people in the AddressBook and prints info about them. void ListPeople(const tutorial::AddressBook& address_book) { - for (int i = 0; i < address_book.person_size(); i++) { - const tutorial::Person& person = address_book.person(i); + for (int i = 0; i < address_book.people_size(); i++) { + const tutorial::Person& person = address_book.people(i); cout << "Person ID: " << person.id() << endl; cout << " Name: " << person.name() << endl; - if (person.has_email()) { + if (person.email() != "") { cout << " E-mail address: " << person.email() << endl; } - for (int j = 0; j < person.phone_size(); j++) { - const tutorial::Person::PhoneNumber& phone_number = person.phone(j); + for (int j = 0; j < person.phones_size(); j++) { + const tutorial::Person::PhoneNumber& phone_number = person.phones(j); switch (phone_number.type()) { case tutorial::Person::MOBILE: |