Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | Merge pull request #199 from google/wkt | Jisi Liu | 2015-02-26 | 6 | -0/+635 | |
|\ \ \ \ | | | | | | | | | | | Add the .proto files for well-known types. | |||||
| * | | | | Add the .proto files for well-known types. | Feng Xiao | 2015-02-09 | 6 | -0/+635 | |
| | | | | | ||||||
* | | | | | 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 | |||||
* | | | | | Merge pull request #221 from google/python_proto3 | Jisi Liu | 2015-02-25 | 4 | -10/+70 | |
|\ \ \ \ \ | | | | | | | | | | | | | Proto3 Python changes for v3.0.0-alpha-2 | |||||
| * | | | | | Fixes for Python/C++ implementation in open-source: | Josh Haberman | 2015-02-25 | 1 | -0/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Rosy hack doesn't apply (that test should be removed for the open-source release). * Added our own copy of parameterized.py (the open-source version of Google Apputils doesn't contain it). * The C++ Descriptor object didn't implement extension_ranges. * Had to implement a hack around returning EncodeError, to work around the module-loading behavior of the test runner. | |||||
| * | | | | | Down integrate from Google internal. | Jisi Liu | 2015-02-25 | 3 | -10/+69 | |
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I34d301133eea9c6f3a822c47d1f91e136fd33145 | |||||
* | | | | | | Include shared_ptr.h into headers to make maps proto work. It is used | Jisi Liu | 2015-02-25 | 1 | -0/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in the map_field_inl.h Change-Id: Ieeaab5507ee34b317d76b5937beb67c298905eb4 | |||||
* | | | | | | Make maps fields work on installed C++ protobufs. | Jisi Liu | 2015-02-25 | 2 | -25/+44 | |
|/ / / / / | | | | | | | | | | | | | | | | Change-Id: Id937e25bbb35968ee76c92bd4a8ce6247408c443 | |||||
* | | | | | Propogate onChange() event when getFooBuilder() is on an oneof message | Jisi Liu | 2015-02-23 | 1 | -0/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | field. Change-Id: Idb5b53da5accd24038a895aba49b684eeee95814 | |||||
* | | | | | Add shutdown code for several newly introduced leaks; | Jisi Liu | 2015-02-21 | 4 | -1/+41 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Disable commandline interface test for heap check tests. Change-Id: I02aa2ad9704e3c70dcecae8b3b3557b18607d455 | |||||
* | | | | | Use static_cast instead of dynamic_cast in arena unittest so that it can | Jisi Liu | 2015-02-20 | 1 | -7/+6 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pass in systems without rtti. Change-Id: Ib32b47a66f14928de9399c49dbdb07263a30d1bc | |||||
* | | | | | Fix review comments. | Jisi Liu | 2015-02-19 | 2 | -10/+11 | |
| | | | | | | | | | | | | | | | | | | | | Change-Id: Iafd4a3aa9d55e31478bf070311eeadfe95ece4d7 | |||||
* | | | | | Remove the unused set common oneof variables in helper | Jisi Liu | 2015-02-19 | 1 | -3/+0 | |
| | | | | | ||||||
* | | | | | fix equal and hash for bytes field for javanano oneof | Jisi Liu | 2015-02-19 | 4 | -22/+46 | |
| | | | | | ||||||
* | | | | | Clear oneofs. | Jisi Liu | 2015-02-19 | 1 | -0/+8 | |
| | | | | | ||||||
* | | | | | hashcode and equals for oneofs in nano. | Jisi Liu | 2015-02-19 | 4 | -12/+34 | |
| | | | | | ||||||
* | | | | | Equals for message oneof field in nano. | Jisi Liu | 2015-02-19 | 1 | -0/+10 | |
| | | | | | ||||||
* | | | | | Oneof message level elements (consts, case getter/clear) and messsage type ↵ | Jisi Liu | 2015-02-19 | 5 | -17/+105 | |
| | | | | | | | | | | | | | | | | | | | | field oneof support. | |||||
* | | | | | Initial check-in for message oneof. | Jisi Liu | 2015-02-19 | 3 | -3/+28 | |
| | | | | | ||||||
* | | | | | Initial check in for primitive oneof fields. | Jisi Liu | 2015-02-19 | 7 | -4/+153 | |
| | | | | | ||||||
* | | | | | Merge branch 'master' of github.com:google/protobuf | Josh Haberman | 2015-02-17 | 14 | -26/+606 | |
|\ \ \ \ \ | ||||||
| * \ \ \ \ | Merge pull request #204 from pherl/master | Jisi Liu | 2015-02-17 | 7 | -11/+301 | |
| |\ \ \ \ \ | | | | | | | | | | | | | | | Implement maps for JavaNano | |||||
| | * | | | | | Get the map factory per mergeFrom() call for JavaNano. | Jisi Liu | 2015-02-07 | 4 | -1/+19 | |
| | | | | | | | ||||||
| | * | | | | | implement hashCode() for JavaNano maps. | Jisi Liu | 2015-02-06 | 1 | -0/+3 | |
| | | | | | | | ||||||
| | * | | | | | Implement Equals for nano. | Jisi Liu | 2015-02-06 | 1 | -0/+5 | |
| | | | | | | | ||||||
| | * | | | | | Fix the behavior when merging conflicting keys, the new value always | Jisi Liu | 2015-02-05 | 1 | -3/+3 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | override the existing one even for message types. | |||||
| | * | | | | | Moving internal code to InternalNano and rename MapUtil to MapFactories. | Jisi Liu | 2015-02-04 | 1 | -3/+3 | |
| | | | | | | | ||||||
| | * | | | | | parsing and serialzation for maps in JavaNano. | Jisi Liu | 2015-02-03 | 1 | -5/+20 | |
| | | | | | | | ||||||
| | * | | | | | Parsing for Maps in JavaNano | Jisi Liu | 2015-02-02 | 2 | -16/+93 | |
| | | | | | | | ||||||
| | * | | | | | Use map generator for maps field; skip entry message. | Jisi Liu | 2015-02-02 | 2 | -1/+9 | |
| | | | | | | | ||||||
| | * | | | | | Initial checkin for maps support in JavaNano. | Jisi Liu | 2015-01-30 | 4 | -10/+174 | |
| | | |/ / / | | |/| | | | ||||||
| * | | | | | Properly support maps in Ruby protoc and another bugfix. | Chris Fallin | 2015-02-12 | 1 | -16/+59 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, we supported map fields in the Ruby DSL. However, we never connected the final link in the chain and generated `map` DSL commands for map fields in `.proto` files. My apologies -- I had been testing with the DSL directly so I missed this. Also fixed a handlerdata-setup-infinite-loop when a map value field's type is its containing message. | |||||
| * | | | | | MIPS: remove immediate constraint within CompareAndSwap. | Gordana Cmiljanovic | 2015-02-09 | 1 | -2/+2 | |
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | Improper use of immediate constraint is slightly non-optimal with gcc/gnu-as but may cause breakage with clang. | |||||
| * | | | | Add missing LIBPROTOC_EXPORT to ruby generator | Nobuaki Sukegawa | 2015-02-08 | 1 | -1/+2 | |
| | | | | | ||||||
| * | | | | Merge pull request #186 from ennerf/win32-msvc-fix | Feng Xiao | 2015-02-02 | 1 | -2/+2 | |
| |\ \ \ \ | | | | | | | | | | | | | MSVC protoc compiler fix | |||||
| | * | | | | removed accidental whitespace | Florian Enner | 2015-02-02 | 1 | -1/+1 | |
| | | | | | | ||||||
| | * | | | | replaced type fix with the recommended way | Florian Enner | 2015-01-31 | 1 | -8/+2 | |
| | | | | | | ||||||
| | * | | | | fixed MSVC compile error | Florian Enner | 2015-01-31 | 1 | -0/+6 | |
| | |/ / / | | | | | | | | | | | | | | | | <stdint.h> is not part of the standard, so I've added a workaround. | |||||
| * | | | | Merge pull request #168 from cfallin/ruby-oneof | Joshua Haberman | 2015-02-02 | 3 | -18/+166 | |
| |\ \ \ \ | | |/ / / | |/| | | | Support oneofs in MRI Ruby C extension. | |||||
| | * | | | Fix golden-file Ruby test to work with out-of-tree builds. | Chris Fallin | 2015-01-14 | 1 | -33/+36 | |
| | | | | | ||||||
| | * | | | Two tests for Ruby code generator: | Chris Fallin | 2015-01-14 | 2 | -0/+117 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - A golden-file test that ensures protoc produces known-valid output. - A Ruby test that loads that golden file and ensures it actually works with the extension. This split strategy allows us to test end-to-end without needing to integrate the Ruby gem build system and the protoc build system. This is desirable because we do not want a gem build/install to depend on building protoc, and we do not want building protoc to depend on building and testing the gem. | |||||
| | * | | | Support oneofs in the Ruby code generator. | Chris Fallin | 2015-01-14 | 1 | -18/+46 | |
| | |/ / | ||||||
| * / / | Fix illegal C++ use of reinterpret_cast<> to cast between nullptr_t and a ↵ | Niall Douglas (s [underscore] sourceforge {at} nedprod [dot] com) | 2015-01-27 | 1 | -1/+1 | |
| |/ / | | | | | | | | | | pointer. | |||||
| * | | Align backslash vertically | zhangkun83 | 2015-01-12 | 1 | -1/+1 | |
| | | | ||||||
| * | | Include names.h as java_names.h in the opensource tree | zhangkun83 | 2015-01-12 | 2 | -0/+88 | |
| | | | ||||||
| * | | Improved little endian byte order detection | Kal Conley | 2014-12-16 | 1 | -1/+2 | |
| | | | | | | | | | | | | | | | | | | | | | Including <sys/param.h> on Mac/iOS doesn't define __BYTE_ORDER so PROTOBUF_LITTLE_ENDIAN was never being defined. This commit adds a check for the __LITTLE_ENDIAN__ macro which is defined by clang and Apple gcc on little endian architectures. | |||||
| * | | Support Ruby code generation only for proto3. | Chris Fallin | 2014-12-12 | 1 | -0/+8 | |
| | | | ||||||
| * | | Add missing header files in src/Makefile.am | Feng Xiao | 2014-12-12 | 1 | -1/+3 | |
| | | | ||||||
| * | | Rename protobuf Ruby module to google/protobuf and rework its build | Chris Fallin | 2014-12-12 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | system. The Ruby module build now uses an amalgamated distribution of upb, and successfully builds a Ruby gem called 'google-protobuf' with module 'google/protobuf'. |