aboutsummaryrefslogtreecommitdiff
path: root/src/google
Commit message (Expand)AuthorAgeFilesLines
* Fix tile atomicops macro.Jisi Liu2015-03-051-6/+6
* Merge pull request #175 from martiert/tile-supportJisi Liu2015-03-053-0/+82
|\
| * Add support for the TILE-Gx processor family.Martin Ertsaas2015-01-223-0/+82
* | Initialize data members in constructors instead of direct initialize inJisi Liu2015-03-011-3/+3
* | use is_proto_enum instead of is_enum for repeated accessor field.Jisi Liu2015-03-011-1/+1
* | Fix hash.h for MSVC and platforms without hash map/set support.Jisi Liu2015-03-011-14/+18
* | Fix hash_map type parameter to add Alloc for other platforms.Jisi Liu2015-03-011-4/+6
* | Use portable GOOGLE_PROTOBUF_THREAD_LOCAL instead of __thread.Jisi Liu2015-03-012-2/+2
* | Down integrate from Google internal branch for C++ and Java.Jisi Liu2015-02-28105-3026/+10099
* | Merge pull request #185 from mzhaom/remove-unusedJisi Liu2015-02-262-26/+1
|\ \
| * | Remove unused methods:Ming Zhao2015-01-292-26/+1
* | | Merge pull request #199 from google/wktJisi Liu2015-02-266-0/+635
|\ \ \
| * | | 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
|\ \ \ \
| * | | | Down integrate from Google internal.Jisi Liu2015-02-253-10/+69
* | | | | Make maps fields work on installed C++ protobufs.Jisi Liu2015-02-251-21/+23
|/ / / /
* | | | Propogate onChange() event when getFooBuilder() is on an oneof messageJisi Liu2015-02-231-0/+1
* | | | Add shutdown code for several newly introduced leaks;Jisi Liu2015-02-214-1/+41
* | | | Use static_cast instead of dynamic_cast in arena unittest so that it canJisi Liu2015-02-201-7/+6
* | | | Fix review comments.Jisi Liu2015-02-192-10/+11
* | | | 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 fi...Jisi Liu2015-02-195-17/+105
* | | | 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
| |\ \ \ \
| | * | | | 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
| | * | | | 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
| * | | | MIPS: remove immediate constraint within CompareAndSwap.Gordana Cmiljanovic2015-02-091-2/+2
| | |/ / | |/| |
| * | | 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
| |\ \ \
| | * | | 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
| | |/ /
| * | | Merge pull request #168 from cfallin/ruby-oneofJoshua Haberman2015-02-022-18/+165
| |\ \ \ | | |/ / | |/| |
| | * | 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
| | * | Support oneofs in the Ruby code generator.Chris Fallin2015-01-141-18/+46
| | |/