aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
* | | | Use static_cast instead of dynamic_cast in arena unittest so that it canJisi Liu2015-02-201-7/+6
|/ / /
* | | Add test for debug string for oneofJisi Liu2015-02-191-0/+2
* | | Fix review comments.Jisi Liu2015-02-193-11/+12
* | | Remove the unused set common oneof variables in helperJisi Liu2015-02-191-3/+0
* | | Add tests for oneofs.Jisi Liu2015-02-191-6/+142
* | | partial oneof tests.Jisi Liu2015-02-191-0/+38
* | | fix equal and hash for bytes field for javanano oneofJisi Liu2015-02-194-22/+46
* | | Add tests for oneof equals and hash.Jisi Liu2015-02-192-0/+81
* | | Uncomment string/bytes fields in oneof nano.Jisi Liu2015-02-191-2/+2
* | | 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-196-18/+106
* | | Initial check-in for message oneof.Jisi Liu2015-02-193-3/+28
* | | Initial check in for primitive oneof fields.Jisi Liu2015-02-198-4/+161
* | | Support maps in NanoPrinter.Jisi Liu2015-02-192-0/+53
* | | Merge pull request #213 from pherl/mapsChris Fallin2015-02-191-2/+1
|\ \ \
| * | | Use EMPTY_BYTES in WireFormatNanoJisi Liu2015-02-191-2/+1
* | | | Merge pull request #212 from haberman/update-from-googleChris Fallin2015-02-187-13/+33
|\ \ \ \
| * \ \ \ Merge branch 'master' of github.com:google/protobufJosh Haberman2015-02-1754-461/+23717
| |\ \ \ \ | |/ / / / |/| | | |
* | | | | Merge pull request #204 from pherl/masterJisi Liu2015-02-1715-87/+1163
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Mark factory setter API as private for alpha release.Jisi Liu2015-02-171-1/+5
| * | | | Merge the javanano map test into the main test target.Jisi Liu2015-02-091-4/+0
| * | | | Add java compiled targets and several tests target into .gitignore.Jisi Liu2015-02-091-0/+11
| * | | | Get the map factory per mergeFrom() call for JavaNano.Jisi Liu2015-02-075-2/+23
| * | | | implement hashCode() for JavaNano maps.Jisi Liu2015-02-062-0/+22
| * | | | Implement Equals for nano.Jisi Liu2015-02-063-2/+166
| * | | | Rename empty bytes in JavaNano.Jisi Liu2015-02-052-4/+3
| * | | | Rename readData() to readPrimitiveField() in JavaNano.Jisi Liu2015-02-053-4/+4
| * | | | Add tests merging empty entries in JavaNano mapJisi Liu2015-02-051-0/+30
| * | | | Fix the behavior when merging conflicting keys, the new value alwaysJisi Liu2015-02-054-37/+38
| * | | | Test keys and values cannot be null.Jisi Liu2015-02-051-1/+23
| * | | | Basic serialization/parsing test.Jisi Liu2015-02-052-1/+130
| * | | | Moving internal code to InternalNano and rename MapUtil to MapFactories.Jisi Liu2015-02-044-237/+233
| * | | | parsing and serialzation for maps in JavaNano.Jisi Liu2015-02-034-55/+316
| * | | | Parsing for Maps in JavaNanoJisi Liu2015-02-023-16/+190
| * | | | Add readData(int) to read primitive value.Jisi Liu2015-02-021-0/+40
| * | | | MOVE TYPE_XXX constants to InternalNano.Jisi Liu2015-02-022-54/+39
| * | | | Use map generator for maps field; skip entry message.Jisi Liu2015-02-022-1/+9
| * | | | Add package for map test for nano.Jisi Liu2015-02-022-1/+8
| * | | | Add tests for JavaNano maps.Jisi Liu2015-02-022-0/+53
| * | | | Initial checkin for maps support in JavaNano.Jisi Liu2015-01-304-10/+174
* | | | | Merge pull request #211 from isaiah/map_inspectChris Fallin2015-02-172-2/+2
|\ \ \ \ \
| * | | | | Google::Protobuf::Map#inspect should be consistent with Hash#inspectIsaiah Peng2015-02-142-2/+2
* | | | | | Merge pull request #209 from cfallin/ruby-protoc-mapsJoshua Haberman2015-02-133-89/+83
|\ \ \ \ \ \
| * | | | | | Addressed code-review comment.Chris Fallin2015-02-131-0/+4
| * | | | | | Properly support maps in Ruby protoc and another bugfix.Chris Fallin2015-02-123-89/+79
|/ / / / / /
* | | | | | Merge pull request #201 from gordana-cmiljanovic-imgtec/mips-atomic-ops-fixFeng Xiao2015-02-121-2/+2
|\ \ \ \ \ \
| * | | | | | MIPS: remove immediate constraint within CompareAndSwap.Gordana Cmiljanovic2015-02-091-2/+2
| | |_|_|/ / | |/| | | |
* | | | | | Merge pull request #203 from pherl/gitignoreChris Fallin2015-02-091-0/+11
|\ \ \ \ \ \ | |/ / / / / |/| | | | |