organicmaps/protobuf
13
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity Actions
2687 commits 28 branches 36 tags 41 MiB
Commit graph

2687 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jisi Liu
4008100e37 Add bazel build/workspace into distribution. 
Change-Id: I96fbe5c84a04f5d95c5484002404fc975f2abd21
 2015-08-26 17:48:08 -07:00
Feng Xiao
5b771ed651 Merge pull request #754 from xfxyjwf/changelog 
Update change log for beta-1.
 2015-08-26 17:38:35 -07:00
Feng Xiao
cc60753820 Update change log for beta-1. 2015-08-26 17:37:51 -07:00
Paul Yang
106f3eb985 Merge pull request #750 from TeBoring/beta-1 
Fix bugs for objectivec
 2015-08-26 16:25:56 -07:00
TeBoring
aca5a60883 Fix bugs for objectivec 2015-08-26 16:24:06 -07:00
Feng Xiao
e94e062b58 Merge branch 'master' of github.com:google/protobuf into beta-1 2015-08-26 15:47:35 -07:00
Joshua Haberman
c7a1f8ec3b Merge pull request #728 from dano/py3_str_compat 
Get all tests passing on Python3 (except Python3.4 cpp implementation)
 2015-08-26 15:44:06 -07:00
Feng Xiao
fecc3d5963 Update post_process_dist.sh 
vsproject files no longer exist.
 2015-08-26 15:33:22 -07:00
Feng Xiao
08da3d4997 Merge pull request #751 from xfxyjwf/version_number 
Update version number.
 2015-08-26 15:31:00 -07:00
Feng Xiao
7ecc19f04f Merge pull request #752 from google/jtattermusch-patch-1 
Update README.md for C#
 2015-08-26 15:29:06 -07:00
Jan Tattermusch
8fca6f83c6 Update README.md for C# 2015-08-26 15:26:34 -07:00
Feng Xiao
ffe9215140 Update version number. 
Protoc, C++ runtime and Java runtime are updated to v3.0.0-beta-1, other
languages are updated to v3.0.0-alpha-4.
 2015-08-26 15:11:43 -07:00
Feng Xiao
047a97ff44 Merge pull request #749 from xfxyjwf/mingw_endian 
Assume LITTLE_ENDIAN for windows build
 2015-08-26 14:43:04 -07:00
Feng Xiao
d9f4636818 Add a TODO to clean-up the LITTLE_ENDIAN macro. 2015-08-26 22:40:41 +01:00
Feng Xiao
b47bf4c930 Assume LITTLE_ENDIAN for windows build. 2015-08-26 22:32:04 +01:00
Feng Xiao
d7d9accc1d Merge pull request #748 from xfxyjwf/unused_typedef 
Remove an unused typedef.
 2015-08-26 13:55:51 -07:00
Feng Xiao
b7bbe54321 Remove an unused typedef. 2015-08-26 13:45:30 -07:00
Feng Xiao
042bfaf67f Merge remote-tracking branch 'origin/master' into beta-1 2015-08-26 13:33:50 -07:00
Feng Xiao
b00595a3a9 Merge pull request #709 from xfxyjwf/map_bug 
Fix JSON map fields parsing.
 2015-08-26 13:18:04 -07:00
Feng Xiao
11e36b1c39 Merge pull request #747 from jtattermusch/sign_mismatch 
add static cast to silence signedness comparison warning
 2015-08-26 13:17:22 -07:00
Jan Tattermusch
276ce8c15b add static cast to silence signedness comparison warning 2015-08-26 13:10:05 -07:00
Feng Xiao
66b074f491 Merge pull request #744 from xfxyjwf/cmake_linux 
Fix cmake build on linux.
 2015-08-26 11:25:08 -07:00
Jan Tattermusch
7e05a2d20d Merge pull request #736 from jtattermusch/fix-descriptor-proto 
Backport: Change where we rename Descriptor.cs to DescriptorProtoFile.cs.
 2015-08-26 08:26:55 -07:00
Feng Xiao
e72c751e4d Fix cmake build on linux. 2015-08-25 22:49:06 -07:00
Jon Skeet
b1b98e4b79 Merge pull request #738 from jtattermusch/include_descriptor_proto 
Include descriptor.proto in nuget package
 2015-08-26 06:44:26 +01:00
Jon Skeet
f6b05f78a4 Merge pull request #739 from jtattermusch/include_descriptor_proto_master 
include descriptor.proto in nuget package
 2015-08-26 06:44:04 +01:00
Feng Xiao
c80f7c6f3c Merge pull request #742 from xfxyjwf/c11_compile 
Fix compile issues with -std=c++11
 2015-08-25 22:35:24 -07:00
Feng Xiao
d9ab86cdbf Fix compile issues with -std=c++11 
This compiles with -std=c++11:
message Foo {
  map<string, Foo> value = 1;
}

This does not compile:
message Foo {
  map<int32, Foo> value = 1;
}

Needs to dig more into the underlying issue.
 2015-08-25 22:20:47 -07:00
Jisi Liu
f9237d2bcd Merge pull request #741 from pherl/beta-1 
fix "memory leaks" in protostream-object files.
 2015-08-25 22:05:31 -07:00
Jisi Liu
0977815af2 fix "memory leaks" in protostream-object files. 
Change-Id: I0aca56802d974cb03cb89c1a294f37068b5b9758
 2015-08-25 22:01:12 -07:00
Jisi Liu
06c9dfd9a3 Merge pull request #740 from pherl/beta-1 
Fix commandline interface file under heapcheck.
 2015-08-25 21:11:58 -07:00
Jisi Liu
01e060f20e Fix commandline interface file under heapcheck. 
The internal down-integrate script probably does not handle the
top level macros well. Moved the macro inside of the namespace
declrations to avoid down-integrate errors in the future.

Change-Id: I3790357f36b0204a2a26577805192a3a1e989df8
 2015-08-25 20:53:19 -07:00
Feng Xiao
b192ba87f7 Merge remote-tracking branch 'origin/master' into beta-1 2015-08-25 20:24:43 -07:00
Jan Tattermusch
72145dffd8 include descriptor.proto in nuget package 2015-08-25 18:46:59 -07:00
Jan Tattermusch
295047518c include descriptor.proto in nuget package 2015-08-25 18:43:01 -07:00
Feng Xiao
cf94f7b744 Merge pull request #726 from DouglasHeriot/msvc-noinline 
Define GOOGLE_ATTRIBUTE_NOINLINE for MSVC. Workaround for VS2015 Release build compiler bug
 2015-08-25 18:16:02 -07:00
Jon Skeet
8f2892bc62 Remove extraneous TODO 2015-08-25 18:10:43 -07:00
Jon Skeet
3c74a0c9cc Change where we rename Descriptor.cs to DescriptorProtoFile.cs. 
We now do this in protoc instead of the generation simpler.

Benefits:
- Generation script is simpler
- Detection is simpler as we now only need to care about one filename
- The embedded descriptor knows itself as "google/protobuf/descriptor.proto" avoiding dependency issues

This PR also makes the "invalid dependency" exception clearer in terms of expected and actual dependencies.
 2015-08-25 18:10:34 -07:00
Feng Xiao
5da0b46811 Merge pull request #734 from TeBoring/beta-1 
Fix bugs on windows
 2015-08-25 18:00:26 -07:00
Bo Yang
ff7bdad231 Fix bugs on windows 2015-08-25 17:58:48 -07:00
Jisi Liu
ed91f89f73 Merge pull request #735 from pherl/beta-1 
Update cmake and BUILD files.
 2015-08-25 17:12:14 -07:00
Jisi Liu
b90f9f8073 Update cmake and BUILD files. 
Change-Id: I17e16fdae6e4d2fb74d178fa5564a609ed58af1d
 2015-08-25 17:06:33 -07:00
Jisi Liu
144ea00659 Merge branch 'beta-1' of github.com:google/protobuf into manual-merge 2015-08-25 17:03:49 -07:00
Jisi Liu
4c663d810e Update descriptor protos. 
Change-Id: I74a73d3135ec1e0e4d52d741a77456b8e55f038f
 2015-08-25 17:03:05 -07:00
Jisi Liu
db45aa117a Merge branch 'beta-1' of github.com:google/protobuf into manual-merge 
Change-Id: I83a93fdb119a643fbc884e6ec3624493f6270370
 2015-08-25 16:51:22 -07:00
Feng Xiao
cc5a1bfede Make the PARSER @Deprecated public. 
(cherry-picking an intenral change).
 2015-08-25 16:50:53 -07:00
Jisi Liu
56c4f57bb0 Merge branch 'gcc-c++11-fix' of https://github.com/nsuke/protobuf into beta-1 
Manually merge pull request: https://github.com/google/protobuf/pull/674
that fixes the gcc C++11 build.
 2015-08-25 16:32:01 -07:00
Feng Xiao
f4ef8fe3b8 Delete incorrectly placed test file. 2015-08-25 14:49:09 -07:00
Feng Xiao
fbb3ef28c9 Merge Java util package to github. 2015-08-25 14:32:09 -07:00
Jon Skeet
f9aed2088d Merge pull request #732 from jskeet/fix-descriptor-proto 
Change where we rename Descriptor.cs to DescriptorProtoFile.cs.
 2015-08-25 17:51:40 +01:00