Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Add missing files to EXTRA_DIST. | Feng Xiao | 2015-12-28 | 1 | -3/+5 |
| | | | | Also delete some unused files. | ||||
* | Down-integrate from internal code base. | Feng Xiao | 2015-12-11 | 1 | -2/+6 |
| | |||||
* | Rename "umbrella" to "reflection" consistently. | Jon Skeet | 2015-11-19 | 1 | -2/+2 |
| | | | | This changes csharp_names.h, which will require a corresponding change in GRPC. | ||||
* | Add support for POWER Linux | Doug Kwan | 2015-11-03 | 1 | -1/+1 |
| | |||||
* | First pass at generating XML documentation from .proto comments. | Jon Skeet | 2015-10-01 | 1 | -0/+2 |
| | | | | | | This could be tidied up significantly, and at some point we will want to parse the markdown and generate more appropriate XML - but this is definitely better than nothing. Generated code changes coming in next commit. | ||||
* | Down-integrate from internal code base. | Feng Xiao | 2015-08-23 | 1 | -10/+31 |
| | |||||
* | Merge branch 'master' of github.com:google/protobuf | Jisi Liu | 2015-08-21 | 1 | -4/+5 |
|\ | | | | | | | Change-Id: If3fb07754a734bae610d95124528e073515ac525 | ||||
| * | Merge pull request #629 from google/master | Jon Skeet | 2015-07-21 | 1 | -0/+9 |
| |\ | | | | | | | Integrate changes from upstream/master into csharp-experimental | ||||
| * \ | Merge pull request #611 from jskeet/csharp-wrappers | Jon Skeet | 2015-07-17 | 1 | -1/+3 |
| |\ \ | | | | | | | | | C# wrapper types | ||||
| | * | | First part of implementing wrapper types. Not ready yet! | Jon Skeet | 2015-07-16 | 1 | -1/+3 |
| | | | | |||||
| * | | | Merge pull request #586 from jtattermusch/csharp_names_export | Jan Tattermusch | 2015-07-16 | 1 | -0/+1 |
| |\ \ \ | | |/ / | |/| | | Export c# naming routines publicly | ||||
| | * | | export c# naming routines publicly | Jan Tattermusch | 2015-07-10 | 1 | -0/+1 |
| | | | | |||||
| * | | | Merge remote-tracking branch 'upstream/master' into csharp-experimental | Jan Tattermusch | 2015-07-15 | 1 | -1/+0 |
| |\ \ \ | | |/ / | |/| | | |||||
| * | | | First pass at map support. | Jon Skeet | 2015-06-25 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | More tests required. Generated code in next commit. | ||||
| * | | | Merge remote-tracking branch 'upstream/master' into proto3-only | Jon Skeet | 2015-06-19 | 1 | -99/+201 |
| |\ \ \ | |||||
| * \ \ \ | Merged master | Jon Skeet | 2015-06-17 | 1 | -23/+18 |
| |\ \ \ \ | |||||
| * | | | | | First stab at new proto3-only code generator | Jon Skeet | 2015-06-05 | 1 | -5/+1 |
| | | | | | | |||||
* | | | | | | Down-integrate from internal branch. | Jisi Liu | 2015-08-21 | 1 | -5/+26 |
| |_|_|_|/ |/| | | | | | | | | | | | | | | Change-Id: Ieb7a2c2fbf35bc2a8fa65b915a5ecb68c83863e4 | ||||
* | | | | | Merge branch 'master' of github.com:google/protobuf into splitheader | Jisi Liu | 2015-07-17 | 1 | -0/+3 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | Change-Id: I5f6cbc2430200e3751ad754cc7ae604338db6f91 | ||||
| * | | | | | Install missing headers | Rob Earhart | 2015-07-14 | 1 | -0/+3 |
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | Install google/protobuf/stubs/status.h, and google/protobuf/stubs/stringpiece.h -- these are required in order to include google/protobuf/util/type_resolver.h. Install google/protobuf/stubs/bytestream.h -- this is required in order to include google/protobuf/util/json_util.h. | ||||
* / | | | | Update make file for extra headers. | Jisi Liu | 2015-07-17 | 1 | -0/+6 |
|/ / / / | | | | | | | | | | | | | Change-Id: Ifbc415755266ba3d0ffa5661fcd7c7d2e3b32a22 | ||||
* | | / | Internal local modifications. | Bo Yang | 2015-07-09 | 1 | -1/+0 |
| |_|/ |/| | | |||||
* | | | Merge pull request #501 from xfxyjwf/down | Feng Xiao | 2015-06-17 | 1 | -99/+201 |
|\ \ \ | |_|/ |/| | | Down-integrate from internal code base. | ||||
| * | | Fix broken builds. | Feng Xiao | 2015-06-17 | 1 | -15/+22 |
| | | | |||||
| * | | Down-integrate from internal code base. | Feng Xiao | 2015-06-15 | 1 | -97/+192 |
| | | | | | | | | | | | | | | | | | | [ci skip] Change-Id: I9391c09640e0b0b2b21c45a97a1fc91814d95c5d | ||||
* | | | Make the code independent of config.h | Jisi Liu | 2015-06-16 | 1 | -2/+10 |
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | Now the Build tool needs to define -DHAVE_ZLIB and -DHAVE-PTHREAD rather than providing a config.h - Make pbconfig.h a manually written file to handle hash conditions according to platform related macros. - Remove #include "config.h" from source code. - Changed the configure.ac and Makefile.am to pass down the macros. - Change cmake to pass down the the macros. Change-Id: I537249d5df8fdeba189706aec436d1ab1104a4dc | ||||
* | | Merge pull request #495 from pherl/master | Jisi Liu | 2015-06-13 | 1 | -18/+3 |
|\ \ | | | | | | | Make pbconfig.h independent of config.h | ||||
| * | | Make pbconfig.h independent of config.h | Jisi Liu | 2015-06-13 | 1 | -18/+3 |
| | | | | | | | | | | | | Change-Id: I31ead985b4ac5b02fb7558d34c1da19fd837b50a | ||||
* | | | Merge pull request #481 from Qartar/master | Feng Xiao | 2015-06-12 | 1 | -2/+4 |
|\ \ \ | |/ / |/| | | Workaround for MSVC's string literal compiler limit. | ||||
| * | | Workaround for MSVC's string literal compiler limit. | Qartar | 2015-06-12 | 1 | -2/+4 |
| |/ | | | | | | | | | | | | | | | | | | | Escape characters don't count for string literal size, no need to pre-generate escape string. Added unit test to touch enormous cpp generated descriptor. Updated makefile to include enormous_descriptor.proto Fixed language compatibility error. | ||||
* / | Beta quality drop of Objective C Support. | Thomas Van Lenten | 2015-06-08 | 1 | -1/+1 |
|/ | | | | | | | | | | | | | | | - Add more to the ObjC dir readme. - Merge the ExtensionField and ExtensionDescriptor to reduce overhead. - Fix an initialization race. - Clean up the Xcode schemes. - Remove the class/enum filter. - Remove some forced inline that were bloating things without proof of performance wins. - Rename some internal types to avoid conflicts with the well know types protos. - Drop the use of ApplyFunctions to the compiler/optimizer can do what it wants. - Better document some possible future improvements. - Add missing support for parsing repeated primitive fields in packed or unpacked forms. - Improve -hash. - Add *Count for repeated and map<> fields to avoid auto create when checking for them being set. | ||||
* | Adds objectivec_helpers.h to the headers installed by make. | Jorge Canizales | 2015-05-26 | 1 | -0/+1 |
| | |||||
* | Copy two data files from ruby/tests to src/google/compiler/ruby. Tests in ↵ | Bo Yang | 2015-05-25 | 1 | -0/+2 |
| | | | | src/google/compiler/ruby depend on these two files, but they were missed in language distributions other than ruby | ||||
* | down-integrate internal changes | Bo Yang | 2015-05-21 | 1 | -0/+27 |
| | |||||
* | Merge pull request #384 from google/csharp | Jie Luo | 2015-05-14 | 1 | -2/+33 |
|\ | | | | | Merge protobuf C# into master (only C# proto2 is supported) | ||||
| * | Merge branch 'master' of github.com:google/protobuf into integrate_from_master | Jan Tattermusch | 2015-05-13 | 1 | -1/+36 |
| |\ | |||||
| * \ | Merge pull request #288 from jtattermusch/csharp_protobuf_reviewed | Jie Luo | 2015-04-17 | 1 | -2/+33 |
| |\ \ | | | | | | | | | C# protocol buffers (initial pull request) | ||||
| | * | | forgot to include header files into automake template | Jan Tattermusch | 2015-04-17 | 1 | -1/+15 |
| | | | | |||||
| | * | | Rewrote C# protogen to C++ (initial version) | Jan Tattermusch | 2015-03-26 | 1 | -2/+19 |
| | | | | |||||
* | | | | Include generated code of well-known types in protobuf C++ runtime. | Feng Xiao | 2015-05-11 | 1 | -6/+30 |
| |_|/ |/| | | | | | | | | Change-Id: I23dee1c1d27b6440658680e9c273b6250213123c | ||||
* | | | Alpha 1 drop of Google's Objective C plugin and runtime support for protobufs. | Thomas Van Lenten | 2015-05-06 | 1 | -0/+25 |
| | | | |||||
* | | | Include well-known type protos in "make install". | Feng Xiao | 2015-04-23 | 1 | -1/+11 |
|/ / | |||||
* / | Change fixture name to be consistent | Tamir Duberstein | 2015-03-31 | 1 | -3/+3 |
|/ | | | | | This fixes the problem where `make check` generates files not ignored by `.gitignore`. | ||||
* | Revert pull request 175: Add support for the TILE-Gx processor family. | Bo Yang | 2015-03-14 | 1 | -1/+0 |
| | |||||
* | Add a missing proto file. | Feng Xiao | 2015-03-13 | 1 | -1/+4 |
| | | | | Change-Id: Ic98584616bd6ee49680273f0cdbe6d9c038ec0e9 | ||||
* | Merge pull request #175 from martiert/tile-support | Jisi Liu | 2015-03-05 | 1 | -0/+1 |
|\ | | | | | Add support for the TILE-Gx processor family. | ||||
| * | Add support for the TILE-Gx processor family. | Martin Ertsaas | 2015-01-22 | 1 | -0/+1 |
| | | |||||
* | | Down integrate from Google internal branch for C++ and Java. | Jisi Liu | 2015-02-28 | 1 | -3/+16 |
| | | | | | | | | | | | | | | | | - Maps for C++ lite - C++ Arena optimizations. - Java Lite runtime code size optimization. Change-Id: I7537a4357c1cb385d23f9e8aa7ffdfeefe079f13 | ||||
* | | Fix the order of BUILT_FILES so that pbconfig.h will be built before | Jisi Liu | 2015-02-25 | 1 | -1/+1 |
| | | | | | | | | | | | | anyother targets. Change-Id: I507009cd92a711739d7d58ccee93dfbf0a9fe135 | ||||
* | | Exclude pbconfg.h from dist, otherwise it breaks VS builds. | Jisi Liu | 2015-02-25 | 1 | -3/+4 |
| | | | | | | | | Change-Id: I7f745929b137b93c122448a4a2d9a7bbab6648d6 |