28595b25ba
Merge pull request #755 from pherl/beta-1
...
Add bazel build/workspace into distribution.
9 years ago
4008100e37
Add bazel build/workspace into distribution.
...
Change-Id: I96fbe5c84a04f5d95c5484002404fc975f2abd21
9 years ago
5b771ed651
Merge pull request #754 from xfxyjwf/changelog
...
Update change log for beta-1.
9 years ago
cc60753820
Update change log for beta-1.
9 years ago
106f3eb985
Merge pull request #750 from TeBoring/beta-1
...
Fix bugs for objectivec
9 years ago
aca5a60883
Fix bugs for objectivec
9 years ago
e94e062b58
Merge branch 'master' of github.com:google/protobuf into beta-1
9 years ago
c7a1f8ec3b
Merge pull request #728 from dano/py3_str_compat
...
Get all tests passing on Python3 (except Python3.4 cpp implementation)
9 years ago
fecc3d5963
Update post_process_dist.sh
...
vsproject files no longer exist.
9 years ago
08da3d4997
Merge pull request #751 from xfxyjwf/version_number
...
Update version number.
9 years ago
7ecc19f04f
Merge pull request #752 from google/jtattermusch-patch-1
...
Update README.md for C#
9 years ago
8fca6f83c6
Update README.md for C#
9 years ago
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.
9 years ago
047a97ff44
Merge pull request #749 from xfxyjwf/mingw_endian
...
Assume LITTLE_ENDIAN for windows build
9 years ago
d9f4636818
Add a TODO to clean-up the LITTLE_ENDIAN macro.
9 years ago
b47bf4c930
Assume LITTLE_ENDIAN for windows build.
9 years ago
d7d9accc1d
Merge pull request #748 from xfxyjwf/unused_typedef
...
Remove an unused typedef.
9 years ago
b7bbe54321
Remove an unused typedef.
9 years ago
042bfaf67f
Merge remote-tracking branch 'origin/master' into beta-1
9 years ago
b00595a3a9
Merge pull request #709 from xfxyjwf/map_bug
...
Fix JSON map fields parsing.
9 years ago
11e36b1c39
Merge pull request #747 from jtattermusch/sign_mismatch
...
add static cast to silence signedness comparison warning
9 years ago
276ce8c15b
add static cast to silence signedness comparison warning
9 years ago
66b074f491
Merge pull request #744 from xfxyjwf/cmake_linux
...
Fix cmake build on linux.
9 years ago
7e05a2d20d
Merge pull request #736 from jtattermusch/fix-descriptor-proto
...
Backport: Change where we rename Descriptor.cs to DescriptorProtoFile.cs.
9 years ago
e72c751e4d
Fix cmake build on linux.
9 years ago
b1b98e4b79
Merge pull request #738 from jtattermusch/include_descriptor_proto
...
Include descriptor.proto in nuget package
9 years ago
f6b05f78a4
Merge pull request #739 from jtattermusch/include_descriptor_proto_master
...
include descriptor.proto in nuget package
9 years ago
c80f7c6f3c
Merge pull request #742 from xfxyjwf/c11_compile
...
Fix compile issues with -std=c++11
9 years ago
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.
9 years ago
f9237d2bcd
Merge pull request #741 from pherl/beta-1
...
fix "memory leaks" in protostream-object files.
9 years ago
0977815af2
fix "memory leaks" in protostream-object files.
...
Change-Id: I0aca56802d974cb03cb89c1a294f37068b5b9758
9 years ago
06c9dfd9a3
Merge pull request #740 from pherl/beta-1
...
Fix commandline interface file under heapcheck.
9 years ago
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
9 years ago
b192ba87f7
Merge remote-tracking branch 'origin/master' into beta-1
9 years ago
72145dffd8
include descriptor.proto in nuget package
9 years ago
295047518c
include descriptor.proto in nuget package
9 years ago
cf94f7b744
Merge pull request #726 from DouglasHeriot/msvc-noinline
...
Define GOOGLE_ATTRIBUTE_NOINLINE for MSVC. Workaround for VS2015 Release build compiler bug
9 years ago
8f2892bc62
Remove extraneous TODO
9 years ago
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.
9 years ago
5da0b46811
Merge pull request #734 from TeBoring/beta-1
...
Fix bugs on windows
9 years ago
ff7bdad231
Fix bugs on windows
9 years ago
ed91f89f73
Merge pull request #735 from pherl/beta-1
...
Update cmake and BUILD files.
9 years ago
b90f9f8073
Update cmake and BUILD files.
...
Change-Id: I17e16fdae6e4d2fb74d178fa5564a609ed58af1d
9 years ago
144ea00659
Merge branch 'beta-1' of github.com:google/protobuf into manual-merge
9 years ago
4c663d810e
Update descriptor protos.
...
Change-Id: I74a73d3135ec1e0e4d52d741a77456b8e55f038f
9 years ago
db45aa117a
Merge branch 'beta-1' of github.com:google/protobuf into manual-merge
...
Change-Id: I83a93fdb119a643fbc884e6ec3624493f6270370
9 years ago
cc5a1bfede
Make the PARSER @Deprecated public.
...
(cherry-picking an intenral change).
9 years ago
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.
9 years ago
f4ef8fe3b8
Delete incorrectly placed test file.
9 years ago
fbb3ef28c9
Merge Java util package to github.
9 years ago
Jisi Liu
Jisi Liu
Feng Xiao
Feng Xiao
Paul Yang
TeBoring
Joshua Haberman
Jan Tattermusch
Jan Tattermusch
Jon Skeet
Jon Skeet