aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of github.com:google/protobufJisi Liu2016-04-0112-106/+218
|\
| * Merge pull request #1353 from keveman/masterJoshua Haberman2016-04-012-17/+30
| |\ | | | | | | Linking the cpp implementation extension statically with libprotobuf
| | * Linking the cpp implementation extension statically with libprotobufManjunath Kudlur2016-04-012-17/+30
| | |
| * | Merge pull request #1377 from jskeet/remove-duplicate-testsJon Skeet2016-04-012-2/+0
| |\ \ | | | | | | | | Remove duplicate test cases.
| | * | Remove duplicate test cases.Jon Skeet2016-04-012-2/+0
| | | | | | | | | | | | | | | | (NCrunch noticed these.)
| * | | Merge pull request #1378 from thomasvl/manual_stream_parsing_helpersThomas Van Lenten2016-04-012-0/+17
| |\ \ \ | | |/ / | |/| | Add -position and -isAtEnd for use when manually parsing input streams.
| | * | Add -position and -isAtEnd for use when manually parsing input streams.Thomas Van Lenten2016-04-012-0/+17
| |/ /
| * | Merge pull request #1369 from jskeet/tools-nuspecJan Tattermusch2016-03-312-14/+37
| |\ \ | | |/ | |/| Introduce a new nuget package, Google.Protobuf.Tools, basically to contain protoc on multiple platforms.
| | * Remove duplicate lineJon Skeet2016-03-311-1/+0
| | |
| | * Introduce a new nuget package, Google.Protobuf.Tools, basically to contain ↵Jon Skeet2016-03-312-14/+38
| | | | | | | | | | | | | | | | | | | | | | | | protoc on multiple platforms. I've moved both protoc.exe and the proto files out of Google.Protobuf. The .proto files aren't a slam-dunk, but it feels like they belong with protoc as you'd *use* them with protoc. It's not clear to me whether we really need both an x86 and x64 version of protoc.exe, as x86 would work on 64-bit Windows anyway. Discuss :)
| * | Merge pull request #1371 from keveman/oversize_protosJoshua Haberman2016-03-312-11/+94
| |\ \ | | | | | | | | Added an API to allow oversize protos when using C++ extension in Python
| | * | Added an API to allow oversize protos when using C++ extension in PythonManjunath Kudlur2016-03-312-11/+94
| | | |
| * | | Merge pull request #1366 from xyzzyz/int128_ostreamFeng Xiao2016-03-311-1/+1
| |\ \ \ | | |/ / | |/| | Replace #include <iostream> with #include <ostream> in int128.cc
| | * | Replace #include <iostream> with #include <ostream>Adam Michalik2016-03-301-1/+1
| | | | | | | | | | | | | | | | | | | | iostream is not actually necessary here, and it introduces unnecessary static initializers.
| * | | Merge pull request #1362 from jskeet/tweak_json_nameJan Tattermusch2016-03-301-61/+39
| |\ \ \ | | |/ / | |/| | Refactoring of FieldDescriptor
| | * | Refactoring of FieldDescriptorJon Skeet2016-03-301-61/+39
| | |/ | | | | | | | | | | | | | | | | | | | | | This makes no externally visible behavioral changes. Internally and non-behaviorally: - We use a field (compiler-generated) to store the JsonName to avoid recomputing it repeatedly - The documentation for JsonName is updated to reflect the meaning better - Readonly autoprops and expression-bodied properties used where possible
* | | Do not use C++11 unicode escape in unittest.Jisi Liu2016-04-011-1/+1
| | | | | | | | | | | | For fixing MSVC
* | | Do not let windows.h define min/max macrosJisi Liu2016-04-011-0/+1
| | |
* | | Allow bigobj for map_unittestJisi Liu2016-04-011-0/+2
| | |
* | | Fix re-definition issue of winsock.h and winsock2.hJisi Liu2016-03-311-0/+1
| | |
* | | Disable sign-compare warning.Jisi Liu2016-03-311-1/+3
| | |
* | | Fix signed-compare warning.Jisi Liu2016-03-311-1/+1
| | |
* | | revert unexpected change for py26Jisi Liu2016-03-311-1/+4
| | |
* | | Fix WIN32 build for map_test.Jisi Liu2016-03-311-0/+6
| | | | | | | | | | | | | | | | | | | | | stubs/common.h undefines the GetMessage macro introduced in windows.h map_test however include stubs/common.h before windows.h is transitively included. This hack force map_test.cc to include windows.h first, so we have a chance to undefine the GetMessage macro.
* | | Remove export macros for classes nested in a template class.Jisi Liu2016-03-311-3/+3
| | |
* | | Fix javanano packageJisi Liu2016-03-311-0/+3
| | |
* | | Fix json_format.py in py26Jisi Liu2016-03-311-2/+4
| | |
* | | Fix breakage of referring to table_ in static funcJisi Liu2016-03-311-1/+1
| | | | | | | | | | | | | | | Referencing data member table_ in static functions break certain platforms. Change it to refer to the declare type void** instead.
* | | Temporarily disable begin is fast test.Jisi Liu2016-03-311-1/+2
| | |
* | | Merge branch 'master' of github.com:google/protobufJisi Liu2016-03-30114-6935/+4729
|\| |
| * | Merge pull request #1360 from pherl/masterJisi Liu2016-03-301-1/+1
| |\ \ | | | | | | | | Use the T() instead of NULL for the default value.
| | * | Use the T() instead of NULL for the default value.Jisi Liu2016-03-291-1/+1
| | | | | | | | | | | | | | | | | | | | The template can be specialized on primitives, e.g. double, where converting NULL will trigger a warning.
| * | | Merge pull request #1295 from haberman/dockerJoshua Haberman2016-03-309-36/+448
| |\ \ \ | | |_|/ | |/| | Add support for running on Jenkins
| | * | Merge branch 'master' into dockerJosh Haberman2016-03-29101-6889/+4074
| | |\|
| | * | Rearranged and commented files for running under Jenkins.Josh Haberman2016-03-0411-140/+115
| | | |
| | * | Disable attempt to use ccache for docker build.Josh Haberman2016-03-033-20/+13
| | | |
| | * | Properly report C++ build time.Josh Haberman2016-03-033-8/+15
| | | |
| | * | Use a local Maven repository to avoid network fetches during tests.Josh Haberman2016-03-032-0/+31
| | | |
| | * | Make Java copy into separate directories so the tests can run concurrently.Josh Haberman2016-03-021-5/+9
| | | |
| | * | Added code to generate XML output file for more granular results.Josh Haberman2016-03-025-11/+122
| | | |
| | * | Added Ruby 2.1, Oracle Java, and C#.Josh Haberman2016-03-023-21/+76
| | | |
| | * | Upgrade Python packages using pip.Josh Haberman2016-03-021-1/+7
| | | |
| | * | Work around tox bug.Josh Haberman2016-03-021-0/+4
| | | |
| | * | Configure ccache directory.Josh Haberman2016-03-022-2/+8
| | | |
| | * | Put Maven in batch mode to avoid spamming the logs.Josh Haberman2016-03-021-4/+7
| | | |
| | * | Install Python deps in Docker image.Josh Haberman2016-03-023-13/+25
| | | |
| | * | Add another test (javanano), but run it in parallel.Josh Haberman2016-03-022-5/+13
| | | |
| | * | Properly add JDK deps in the Docker image.Josh Haberman2016-03-023-5/+19
| | | |
| | * | Try running multiple tests in a row.Josh Haberman2016-03-024-51/+57
| | | |
| | * | Added ccache support.Josh Haberman2016-03-024-6/+22
| | | |
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-04 17:38:37 +0000