~thopiekar/protobuf/+git/protobuf:3.1.x

Last commit made on 2016-11-29
Get this branch:
git clone -b 3.1.x https://git.launchpad.net/~thopiekar/protobuf/+git/protobuf

Branch merges

Branch information

Name:
3.1.x
Repository:
lp:~thopiekar/protobuf/+git/protobuf

Recent commits

9f69353... by Adam Cozzette

Merge pull request #2421 from tsondergaard/3.1.x

Export fixed_address_empty_string

c699788... by Thomas Sondergaard <email address hidden>

Export fixed_address_empty_string

commit 98835fb8f8 broke use of protobuf as shared library on Windows. Example
error message:

  error LNK2001: unresolved external symbol "class google::protobuf::internal::ExplicitlyConstructed<class std::basic_string<char,struct std::char_traits<char>,class std::allocator<char> > > google::protobuf::internal::fixed_address_empty_string"

0c34e86... by Paul Yang <email address hidden>

Fix php test on mac. (#2402)

Previously, this has been fixed on master in
51c5ff889ccd3836c25f40baafb350f92c9ee103.

2286e5f... by Paul Yang <email address hidden>

Rename Empty to GPBEmpty in php generated file. (#2379)

In php, class name cannot be "Empty". Modified code generator to (#2375) generate GPBEmpty instead (for google.protobuf.Empty only). Also change
runtime code to work with the new generated code accordingly.

60d95f3... by Paul Yang <email address hidden>

Fix the bug that message without namespace is not found in the descriptor pool. (#2240)

0321baf... by Feng Xiao <email address hidden>

Merge pull request #2203 from mrry/msvc_fix

Fix MSVC build when HAVE_LONG_LONG is defined.

bc3bff1... by Paul Yang <email address hidden>

Fix python_cpp test on Mac. Link staticly when building extension, so that the extension doesn't require installing protobuf library. (#2232)

b0d62dd... by Bo Yang <email address hidden>

Add csharp/build_tools.sh for dist check.

96e2d76... by Bo Yang <email address hidden>

Fix compile error for php on Mac.

75b6988... by Bo Yang <email address hidden>

Fix segmentation fault when ZTS is defined.