8fca6f83c6
Update README.md for C#
10 years ago
047a97ff44
Merge pull request #749 from xfxyjwf/mingw_endian
...
Assume LITTLE_ENDIAN for windows build
10 years ago
d9f4636818
Add a TODO to clean-up the LITTLE_ENDIAN macro.
10 years ago
b47bf4c930
Assume LITTLE_ENDIAN for windows build.
10 years ago
d7d9accc1d
Merge pull request #748 from xfxyjwf/unused_typedef
...
Remove an unused typedef.
10 years ago
b7bbe54321
Remove an unused typedef.
10 years ago
042bfaf67f
Merge remote-tracking branch 'origin/master' into beta-1
10 years ago
b00595a3a9
Merge pull request #709 from xfxyjwf/map_bug
...
Fix JSON map fields parsing.
10 years ago
11e36b1c39
Merge pull request #747 from jtattermusch/sign_mismatch
...
add static cast to silence signedness comparison warning
10 years ago
276ce8c15b
add static cast to silence signedness comparison warning
10 years ago
66b074f491
Merge pull request #744 from xfxyjwf/cmake_linux
...
Fix cmake build on linux.
10 years ago
7e05a2d20d
Merge pull request #736 from jtattermusch/fix-descriptor-proto
...
Backport: Change where we rename Descriptor.cs to DescriptorProtoFile.cs.
10 years ago
e72c751e4d
Fix cmake build on linux.
10 years ago
b1b98e4b79
Merge pull request #738 from jtattermusch/include_descriptor_proto
...
Include descriptor.proto in nuget package
10 years ago
f6b05f78a4
Merge pull request #739 from jtattermusch/include_descriptor_proto_master
...
include descriptor.proto in nuget package
10 years ago
c80f7c6f3c
Merge pull request #742 from xfxyjwf/c11_compile
...
Fix compile issues with -std=c++11
10 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.
10 years ago
f9237d2bcd
Merge pull request #741 from pherl/beta-1
...
fix "memory leaks" in protostream-object files.
10 years ago
0977815af2
fix "memory leaks" in protostream-object files.
...
Change-Id: I0aca56802d974cb03cb89c1a294f37068b5b9758
10 years ago
06c9dfd9a3
Merge pull request #740 from pherl/beta-1
...
Fix commandline interface file under heapcheck.
10 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
10 years ago
b192ba87f7
Merge remote-tracking branch 'origin/master' into beta-1
10 years ago
72145dffd8
include descriptor.proto in nuget package
10 years ago
295047518c
include descriptor.proto in nuget package
10 years ago
cf94f7b744
Merge pull request #726 from DouglasHeriot/msvc-noinline
...
Define GOOGLE_ATTRIBUTE_NOINLINE for MSVC. Workaround for VS2015 Release build compiler bug
10 years ago
8f2892bc62
Remove extraneous TODO
10 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.
10 years ago
5da0b46811
Merge pull request #734 from TeBoring/beta-1
...
Fix bugs on windows
10 years ago
ff7bdad231
Fix bugs on windows
10 years ago
ed91f89f73
Merge pull request #735 from pherl/beta-1
...
Update cmake and BUILD files.
10 years ago
b90f9f8073
Update cmake and BUILD files.
...
Change-Id: I17e16fdae6e4d2fb74d178fa5564a609ed58af1d
10 years ago
144ea00659
Merge branch 'beta-1' of github.com:google/protobuf into manual-merge
10 years ago
4c663d810e
Update descriptor protos.
...
Change-Id: I74a73d3135ec1e0e4d52d741a77456b8e55f038f
10 years ago
db45aa117a
Merge branch 'beta-1' of github.com:google/protobuf into manual-merge
...
Change-Id: I83a93fdb119a643fbc884e6ec3624493f6270370
10 years ago
cc5a1bfede
Make the PARSER @Deprecated public.
...
(cherry-picking an intenral change).
10 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.
10 years ago
f4ef8fe3b8
Delete incorrectly placed test file.
10 years ago
fbb3ef28c9
Merge Java util package to github.
10 years ago
f9aed2088d
Merge pull request #732 from jskeet/fix-descriptor-proto
...
Change where we rename Descriptor.cs to DescriptorProtoFile.cs.
10 years ago
31d119af22
Remove extraneous TODO
10 years ago
ca89a1a118
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.
10 years ago
839b180dba
Cherry-pick Java utf8 change.
10 years ago
b17ec3ca11
Down-integrate from internal code base.
10 years ago
eee38b0c01
Down-integrate from google3.
10 years ago
3253634dcb
Merge pull request #711 from tamird/python3-prep
...
Remove Python 2.5 cruft
10 years ago
87993d7507
assertEquals is deprecated
10 years ago
821fcb2ded
Use assertIsInstance
10 years ago
09831c8768
Clean up exception syntax
10 years ago
322d8939fc
Remove Python 2.5 cruft
10 years ago
3ff5625231
Merge pull request #722 from dano/py2_py3_straddle
...
Add tox, Python 2.6 compatibility, and many Python 3 compatibility fixes
10 years ago
Jan Tattermusch
Feng Xiao
Feng Xiao
Jan Tattermusch
Jon Skeet
Jisi Liu
Jisi Liu
Jon Skeet
Bo Yang
Joshua Haberman
Tamir Duberstein