 Jisi Liu
|
aeacf51602
Merge pull request #1381 from pherl/internal-merge
|
10 years ago |
|
Jisi Liu
|
7630a83767
Merge branch 'master' into internal-merge
|
10 years ago |
|
Jisi Liu
|
cba75ad404
Merge branch 'master' of github.com:google/protobuf
|
10 years ago |
|
Jisi Liu
|
89343d87c6
Do not use C++11 unicode escape in unittest.
|
10 years ago |
|
Joshua Haberman
|
452e2b2c5c
Merge pull request #1353 from keveman/master
|
10 years ago |
|
Manjunath Kudlur
|
cf828deb9b
Linking the cpp implementation extension statically with libprotobuf
|
10 years ago |
|
Jisi Liu
|
93811ca9f7
Do not let windows.h define min/max macros
|
10 years ago |
|
Jisi Liu
|
3b6df0612d
Allow bigobj for map_unittest
|
10 years ago |
|
Jon Skeet
|
9d7a1727e5
Merge pull request #1377 from jskeet/remove-duplicate-tests
|
10 years ago |
|
Thomas Van Lenten
|
a293180541
Merge pull request #1378 from thomasvl/manual_stream_parsing_helpers
|
10 years ago |
|
Thomas Van Lenten
|
331cee5022
Add -position and -isAtEnd for use when manually parsing input streams.
|
10 years ago |
|
Jon Skeet
|
46e088e2b6
Remove duplicate test cases.
|
10 years ago |
|
Jan Tattermusch
|
099ff1ea14
Merge pull request #1369 from jskeet/tools-nuspec
|
10 years ago |
|
Jisi Liu
|
203bb5eb33
Fix re-definition issue of winsock.h and winsock2.h
|
10 years ago |
|
Jisi Liu
|
1bf446c71e
Disable sign-compare warning.
|
10 years ago |
|
Jisi Liu
|
7b1cbbd50e
Fix signed-compare warning.
|
10 years ago |
|
Jisi Liu
|
012ac9a0a6
revert unexpected change for py26
|
10 years ago |
|
Jisi Liu
|
bc1f2e7e6e
Fix WIN32 build for map_test.
|
10 years ago |
|
Jisi Liu
|
cbfd9d43c8
Remove export macros for classes nested in a template class.
|
10 years ago |
|
Joshua Haberman
|
81eb84c029
Merge pull request #1371 from keveman/oversize_protos
|
10 years ago |
|
Manjunath Kudlur
|
1283625b0f
Added an API to allow oversize protos when using C++ extension in Python
|
10 years ago |
|
Jisi Liu
|
5805c2dfb7
Fix javanano package
|
10 years ago |
|
Jisi Liu
|
fc7eeda69c
Fix json_format.py in py26
|
10 years ago |
|
Feng Xiao
|
5c63266ed3
Merge pull request #1366 from xyzzyz/int128_ostream
|
10 years ago |
|
Jisi Liu
|
94aa50ffd6
Fix breakage of referring to table_ in static func
|
10 years ago |
|
Jisi Liu
|
9e7fa0678d
Temporarily disable begin is fast test.
|
10 years ago |
|
Jon Skeet
|
dfd47600d1
Remove duplicate line
|
10 years ago |
|
Jon Skeet
|
ca0461c186
Introduce a new nuget package, Google.Protobuf.Tools, basically to contain protoc on multiple platforms.
|
10 years ago |
|
Jan Tattermusch
|
a16c8a50f0
Merge pull request #1362 from jskeet/tweak_json_name
|
10 years ago |
|
Adam Michalik
|
955841e620
Replace #include <iostream> with #include <ostream>
|
10 years ago |
