aboutsummaryrefslogtreecommitdiff
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Fix the order of BUILT_FILES so that pbconfig.h will be built beforeJisi Liu2015-02-251-1/+1
* Exclude pbconfg.h from dist, otherwise it breaks VS builds.Jisi Liu2015-02-251-3/+4
* Merge pull request #221 from google/python_proto3Jisi Liu2015-02-254-10/+70
|\
| * Fixes for Python/C++ implementation in open-source:Josh Haberman2015-02-251-0/+1
| * Down integrate from Google internal.Jisi Liu2015-02-253-10/+69
* | Include shared_ptr.h into headers to make maps proto work. It is usedJisi Liu2015-02-251-0/+1
* | Make maps fields work on installed C++ protobufs.Jisi Liu2015-02-252-25/+44
|/
* 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-1714-26/+606
|\
| * Merge pull request #204 from pherl/masterJisi Liu2015-02-177-11/+301
| |\
| | * 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-304-10/+174
| * | 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-023-18/+166
| |\ \ | | |/ | |/|
| | * 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-142-0/+117
| | * 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 poi...Niall Douglas (s [underscore] sourceforge {at} nedprod [dot] com)2015-01-271-1/+1
| |/
| * Align backslash verticallyzhangkun832015-01-121-1/+1
| * Include names.h as java_names.h in the opensource treezhangkun832015-01-122-0/+88
| * Improved little endian byte order detectionKal Conley2014-12-161-1/+2
| * Support Ruby code generation only for proto3.Chris Fallin2014-12-121-0/+8
| * Add missing header files in src/Makefile.amFeng Xiao2014-12-121-1/+3
| * Rename protobuf Ruby module to google/protobuf and rework its buildChris Fallin2014-12-121-1/+1
* | Integrate changes from Google open-source branch.Josh Haberman2015-02-177-14/+35
|/
* Merge pull request #128 from krishnanm86/masterFeng Xiao2014-12-122-14/+14
|\
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-30 05:52:11 +0000