diff options
| author | Jeff Davidson <jpd@google.com> | 2015-01-20 13:02:58 -0800 |
|---|---|---|
| committer | Jeff Davidson <jpd@google.com> | 2015-01-20 13:12:29 -0800 |
| commit | afb4b72037e3f13db208590fc782c4bc8e27f862 (patch) | |
| tree | 204041a6b0ac0941d14faa2afe222d1b4b627db9 /examples | |
| parent | 80aff29bb2d37977a02c0a677721522d3467a4d9 (diff) | |
| download | external_protobuf-afb4b72037e3f13db208590fc782c4bc8e27f862.zip external_protobuf-afb4b72037e3f13db208590fc782c4bc8e27f862.tar.gz external_protobuf-afb4b72037e3f13db208590fc782c4bc8e27f862.tar.bz2 | |
Upgrade protobuf library to v2.6.1.
The previous commit was actually between v2.6.0 and v2.6.1. This CL
was created by generating a patch with:
git format-patch edc5994525c79cd1919859a370837a6ff7c8e308..v2.6.1
and applying this patch to the tree. The patch was clean except for
pom.xml, where the packaging type should have previously been changed
from "jar" to "bundle".
Reran ./configure && make -j12 check to regenerate configure script
and makefiles.
Change-Id: I817ff426c9a512cbda0246df5aee38f97e762dea
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/README.txt | 2 | ||||
| -rw-r--r-- | examples/list_people.cc | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/examples/README.txt b/examples/README.txt index d22bf06..f5530a5 100644 --- a/examples/README.txt +++ b/examples/README.txt @@ -22,7 +22,7 @@ All of these programs simply take an address book file as their parameter. The add_person programs will create the file if it doesn't already exist. These examples are part of the Protocol Buffers tutorial, located at: - http://code.google.com/apis/protocolbuffers/docs/tutorials.html + https://developers.google.com/protocol-buffers/docs/tutorials * Note that on some platforms you may have to edit the Makefile and remove "-lpthread" from the linker commands (perhaps replacing it with something else). diff --git a/examples/list_people.cc b/examples/list_people.cc index d0f40d6..5363152 100644 --- a/examples/list_people.cc +++ b/examples/list_people.cc @@ -4,7 +4,6 @@ #include <fstream> #include <string> #include "addressbook.pb.h" -#include <google/protobuf/io/zero_copy_stream_impl_lite.h> using namespace std; // Iterates though all people in the AddressBook and prints info about them. |