Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Add test for debug string for oneof | Jisi Liu | 2015-02-19 | 1 | -0/+2 |
| | | | | Change-Id: I6a51a35c69ac24a60dd96ef69d556b1e68bc37d6 | ||||
* | Fix review comments. | Jisi Liu | 2015-02-19 | 3 | -11/+12 |
| | | | | Change-Id: Iafd4a3aa9d55e31478bf070311eeadfe95ece4d7 | ||||
* | Remove the unused set common oneof variables in helper | Jisi Liu | 2015-02-19 | 1 | -3/+0 |
| | |||||
* | Add tests for oneofs. | Jisi Liu | 2015-02-19 | 1 | -6/+142 |
| | |||||
* | partial oneof tests. | Jisi Liu | 2015-02-19 | 1 | -0/+38 |
| | |||||
* | fix equal and hash for bytes field for javanano oneof | Jisi Liu | 2015-02-19 | 4 | -22/+46 |
| | |||||
* | Add tests for oneof equals and hash. | Jisi Liu | 2015-02-19 | 2 | -0/+81 |
| | |||||
* | Uncomment string/bytes fields in oneof nano. | Jisi Liu | 2015-02-19 | 1 | -2/+2 |
| | |||||
* | 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 | 6 | -18/+106 |
| | | | | 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 | 8 | -4/+161 |
| | |||||
* | Support maps in NanoPrinter. | Jisi Liu | 2015-02-19 | 2 | -0/+53 |
| | |||||
* | Merge pull request #213 from pherl/maps | Chris Fallin | 2015-02-19 | 1 | -2/+1 |
|\ | | | | | Use EMPTY_BYTES in WireFormatNano | ||||
| * | Use EMPTY_BYTES in WireFormatNano | Jisi Liu | 2015-02-19 | 1 | -2/+1 |
| | | |||||
* | | Merge pull request #212 from haberman/update-from-google | Chris Fallin | 2015-02-18 | 7 | -13/+33 |
|\ \ | | | | | | | Integrated changes from Google opensource branch. | ||||
| * \ | Merge branch 'master' of github.com:google/protobuf | Josh Haberman | 2015-02-17 | 54 | -461/+23717 |
| |\ \ | |/ / |/| | | |||||
* | | | Merge pull request #204 from pherl/master | Jisi Liu | 2015-02-17 | 15 | -87/+1163 |
|\ \ \ | | |/ | |/| | Implement maps for JavaNano | ||||
| * | | Mark factory setter API as private for alpha release. | Jisi Liu | 2015-02-17 | 1 | -1/+5 |
| | | | |||||
| * | | Merge the javanano map test into the main test target. | Jisi Liu | 2015-02-09 | 1 | -4/+0 |
| | | | |||||
| * | | Add java compiled targets and several tests target into .gitignore. | Jisi Liu | 2015-02-09 | 1 | -0/+11 |
| | | | |||||
| * | | Get the map factory per mergeFrom() call for JavaNano. | Jisi Liu | 2015-02-07 | 5 | -2/+23 |
| | | | |||||
| * | | implement hashCode() for JavaNano maps. | Jisi Liu | 2015-02-06 | 2 | -0/+22 |
| | | | |||||
| * | | Implement Equals for nano. | Jisi Liu | 2015-02-06 | 3 | -2/+166 |
| | | | |||||
| * | | Rename empty bytes in JavaNano. | Jisi Liu | 2015-02-05 | 2 | -4/+3 |
| | | | |||||
| * | | Rename readData() to readPrimitiveField() in JavaNano. | Jisi Liu | 2015-02-05 | 3 | -4/+4 |
| | | | |||||
| * | | Add tests merging empty entries in JavaNano map | Jisi Liu | 2015-02-05 | 1 | -0/+30 |
| | | | |||||
| * | | Fix the behavior when merging conflicting keys, the new value always | Jisi Liu | 2015-02-05 | 4 | -37/+38 |
| | | | | | | | | | | | | override the existing one even for message types. | ||||
| * | | Test keys and values cannot be null. | Jisi Liu | 2015-02-05 | 1 | -1/+23 |
| | | | |||||
| * | | Basic serialization/parsing test. | Jisi Liu | 2015-02-05 | 2 | -1/+130 |
| | | | |||||
| * | | Moving internal code to InternalNano and rename MapUtil to MapFactories. | Jisi Liu | 2015-02-04 | 4 | -237/+233 |
| | | | |||||
| * | | parsing and serialzation for maps in JavaNano. | Jisi Liu | 2015-02-03 | 4 | -55/+316 |
| | | | |||||
| * | | Parsing for Maps in JavaNano | Jisi Liu | 2015-02-02 | 3 | -16/+190 |
| | | | |||||
| * | | Add readData(int) to read primitive value. | Jisi Liu | 2015-02-02 | 1 | -0/+40 |
| | | | |||||
| * | | MOVE TYPE_XXX constants to InternalNano. | Jisi Liu | 2015-02-02 | 2 | -54/+39 |
| | | | |||||
| * | | Use map generator for maps field; skip entry message. | Jisi Liu | 2015-02-02 | 2 | -1/+9 |
| | | | |||||
| * | | Add package for map test for nano. | Jisi Liu | 2015-02-02 | 2 | -1/+8 |
| | | | |||||
| * | | Add tests for JavaNano maps. | Jisi Liu | 2015-02-02 | 2 | -0/+53 |
| | | | |||||
| * | | Initial checkin for maps support in JavaNano. | Jisi Liu | 2015-01-30 | 4 | -10/+174 |
| | | | |||||
* | | | Merge pull request #211 from isaiah/map_inspect | Chris Fallin | 2015-02-17 | 2 | -2/+2 |
|\ \ \ | | | | | | | | | Ruby implementation Map#inspect should be consistent with Hash#inspect | ||||
| * | | | Google::Protobuf::Map#inspect should be consistent with Hash#inspect | Isaiah Peng | 2015-02-14 | 2 | -2/+2 |
| | | | | |||||
* | | | | Merge pull request #209 from cfallin/ruby-protoc-maps | Joshua Haberman | 2015-02-13 | 3 | -89/+83 |
|\ \ \ \ | | | | | | | | | | | Properly support maps in Ruby protoc and another bugfix. | ||||
| * | | | | Addressed code-review comment. | Chris Fallin | 2015-02-13 | 1 | -0/+4 |
| | | | | | |||||
| * | | | | Properly support maps in Ruby protoc and another bugfix. | Chris Fallin | 2015-02-12 | 3 | -89/+79 |
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. | ||||
* | | | | Merge pull request #201 from gordana-cmiljanovic-imgtec/mips-atomic-ops-fix | Feng Xiao | 2015-02-12 | 1 | -2/+2 |
|\ \ \ \ | | | | | | | | | | | MIPS: remove immediate constraint within CompareAndSwap. | ||||
| * | | | | 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. | ||||
* | | | | | Merge pull request #203 from pherl/gitignore | Chris Fallin | 2015-02-09 | 1 | -0/+11 |
|\ \ \ \ \ | |/ / / / |/| | | | | Add java compiled targets and several tests target into .gitignore. | ||||
| * | | | | Add java compiled targets and several tests target into .gitignore. | Jisi Liu | 2015-02-09 | 1 | -0/+11 |
| | |/ / | |/| | |