aboutsummaryrefslogtreecommitdiff
path: root/src/google
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #185 from mzhaom/remove-unusedJisi Liu2015-02-262-26/+1
|\ | | | | Remove unused methods:
| * Remove unused methods:Ming Zhao2015-01-292-26/+1
| | | | | | | | MessageTypeProtoName, IsVariableLenType
* | Merge pull request #199 from google/wktJisi Liu2015-02-266-0/+635
|\ \ | | | | | | Add the .proto files for well-known types.
| * | Add the .proto files for well-known types.Feng Xiao2015-02-096-0/+635
| | |
* | | Merge pull request #221 from google/python_proto3Jisi Liu2015-02-253-10/+69
|\ \ \ | | | | | | | | Proto3 Python changes for v3.0.0-alpha-2
| * | | Down integrate from Google internal.Jisi Liu2015-02-253-10/+69
| | | | | | | | | | | | | | | | Change-Id: I34d301133eea9c6f3a822c47d1f91e136fd33145
* | | | Make maps fields work on installed C++ protobufs.Jisi Liu2015-02-251-21/+23
|/ / / | | | | | | | | | Change-Id: Id937e25bbb35968ee76c92bd4a8ce6247408c443
* | | Propogate onChange() event when getFooBuilder() is on an oneof messageJisi Liu2015-02-231-0/+1
| | | | | | | | | | | | | | | | | | field. Change-Id: Idb5b53da5accd24038a895aba49b684eeee95814
* | | Add shutdown code for several newly introduced leaks;Jisi Liu2015-02-214-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 canJisi Liu2015-02-201-7/+6
| | | | | | | | | | | | | | | | | | pass in systems without rtti. Change-Id: Ib32b47a66f14928de9399c49dbdb07263a30d1bc
* | | Fix review comments.Jisi Liu2015-02-192-10/+11
| | | | | | | | | | | | Change-Id: Iafd4a3aa9d55e31478bf070311eeadfe95ece4d7
* | | Remove the unused set common oneof variables in helperJisi Liu2015-02-191-3/+0
| | |
* | | fix equal and hash for bytes field for javanano oneofJisi Liu2015-02-194-22/+46
| | |
* | | Clear oneofs.Jisi Liu2015-02-191-0/+8
| | |
* | | hashcode and equals for oneofs in nano.Jisi Liu2015-02-194-12/+34
| | |
* | | Equals for message oneof field in nano.Jisi Liu2015-02-191-0/+10
| | |
* | | Oneof message level elements (consts, case getter/clear) and messsage type ↵Jisi Liu2015-02-195-17/+105
| | | | | | | | | | | | field oneof support.
* | | Initial check-in for message oneof.Jisi Liu2015-02-193-3/+28
| | |
* | | Initial check in for primitive oneof fields.Jisi Liu2015-02-197-4/+153
| | |
* | | Merge branch 'master' of github.com:google/protobufJosh Haberman2015-02-1713-15/+590
|\ \ \
| * \ \ Merge pull request #204 from pherl/masterJisi Liu2015-02-176-1/+289
| |\ \ \ | | | | | | | | | | Implement maps for JavaNano
| | * | | Get the map factory per mergeFrom() call for JavaNano.Jisi Liu2015-02-074-1/+19
| | | | |
| | * | | implement hashCode() for JavaNano maps.Jisi Liu2015-02-061-0/+3
| | | | |
| | * | | Implement Equals for nano.Jisi Liu2015-02-061-0/+5
| | | | |
| | * | | Fix the behavior when merging conflicting keys, the new value alwaysJisi Liu2015-02-051-3/+3
| | | | | | | | | | | | | | | | | | | | override the existing one even for message types.
| | * | | Moving internal code to InternalNano and rename MapUtil to MapFactories.Jisi Liu2015-02-041-3/+3
| | | | |
| | * | | parsing and serialzation for maps in JavaNano.Jisi Liu2015-02-031-5/+20
| | | | |
| | * | | Parsing for Maps in JavaNanoJisi Liu2015-02-022-16/+93
| | | | |
| | * | | Use map generator for maps field; skip entry message.Jisi Liu2015-02-022-1/+9
| | | | |
| | * | | Initial checkin for maps support in JavaNano.Jisi Liu2015-01-303-0/+162
| | | |/ | | |/|
| * | | Properly support maps in Ruby protoc and another bugfix.Chris Fallin2015-02-121-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 Cmiljanovic2015-02-091-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 generatorNobuaki Sukegawa2015-02-081-1/+2
| | |
| * | Merge pull request #186 from ennerf/win32-msvc-fixFeng Xiao2015-02-021-2/+2
| |\ \ | | | | | | | | MSVC protoc compiler fix
| | * | removed accidental whitespaceFlorian Enner2015-02-021-1/+1
| | | |
| | * | replaced type fix with the recommended wayFlorian Enner2015-01-311-8/+2
| | | |
| | * | fixed MSVC compile errorFlorian Enner2015-01-311-0/+6
| | |/ | | | | | | | | | <stdint.h> is not part of the standard, so I've added a workaround.
| * | Merge pull request #168 from cfallin/ruby-oneofJoshua Haberman2015-02-022-18/+165
| |\ \ | | |/ | |/| Support oneofs in MRI Ruby C extension.
| | * Fix golden-file Ruby test to work with out-of-tree builds.Chris Fallin2015-01-141-33/+36
| | |
| | * Two tests for Ruby code generator:Chris Fallin2015-01-141-0/+116
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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 Fallin2015-01-141-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-271-1/+1
| |/ | | | | | | pointer.
| * Include names.h as java_names.h in the opensource treezhangkun832015-01-121-0/+87
| |
| * Improved little endian byte order detectionKal Conley2014-12-161-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 Fallin2014-12-121-0/+8
| |
| * Rename protobuf Ruby module to google/protobuf and rework its buildChris Fallin2014-12-121-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'.
* | Integrate changes from Google open-source branch.Josh Haberman2015-02-176-14/+34
|/
* Merge pull request #128 from krishnanm86/masterFeng Xiao2014-12-122-14/+14
|\ | | | | Source code refactoring. Extracted common functionality in cpp_helpers.c...
| * Reverting the space at the end for both files changedKrishna2014-12-122-2/+2
| |
| * Reverting the space at the endKrishna2014-12-121-1/+1
| |