aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #190 from isaiah/to_aryChris Fallin2015-02-032-32/+30
|\ | | | | add #to_ary to RepeatedField
| * add #to_ary to RepeatedFieldIsaiah Peng2015-02-032-32/+30
| |
* | Merge pull request #186 from ennerf/win32-msvc-fixFeng Xiao2015-02-022-2/+10
|\ \ | | | | | | 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.
| * | added missing ruby generator to msvc projectFlorian Enner2015-01-311-0/+8
| |/ | | | | | | https://github.com/google/protobuf/issues/87
* | Merge pull request #168 from cfallin/ruby-oneofJoshua Haberman2015-02-0217-262/+2348
|\ \ | |/ |/| Support oneofs in MRI Ruby C extension.
| * Updated based on code-review comments.Chris Fallin2015-02-021-2/+1
| |
| * Updated based on code-review comments.Chris Fallin2015-02-023-16/+51
| |
| * Addressed code-review comments.Chris Fallin2015-01-262-12/+26
| |
| * Addressed code-review comments.Chris Fallin2015-01-263-7/+12
| |
| * Ruby extension: added oneof accessor.Chris Fallin2015-01-143-1/+53
| |
| * Addressed code-review comments.Chris Fallin2015-01-145-59/+71
| |
| * Fix golden-file Ruby test to work with out-of-tree builds.Chris Fallin2015-01-142-34/+41
| |
| * Two tests for Ruby code generator:Chris Fallin2015-01-146-1/+328
| | | | | | | | | | | | | | | | | | | | | | | | - 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
| |
| * Support oneofs in MRI Ruby C extension.Chris Fallin2015-01-148-233/+1840
| |
* | Remove deleted files from Makefile.am.Feng Xiao2015-01-291-1/+0
| |
* | Merge pull request #180 from ned14/masterFeng Xiao2015-01-271-1/+1
|\ \ | | | | | | Fix illegal C++ use of reinterpret_cast<> to cast between nullptr_t and a pointer
| * | 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.
* / Delete unused files.Feng Xiao2015-01-271-27/+0
|/
* Merge pull request #155 from cfallin/ruby-mapsJoshua Haberman2015-01-1312-582/+2599
|\ | | | | Support for maps in the MRI C Ruby extension.
| * Line-wraps at 80 chars.Chris Fallin2015-01-131-13/+18
| |
| * Addressed code-review comments.Chris Fallin2015-01-122-23/+14
| |
| * Update upb amalgamation.Chris Fallin2015-01-092-400/+747
| |
| * Addressed code-review comments.Chris Fallin2015-01-096-135/+72
| |
| * Addressed code-review comments.Chris Fallin2015-01-066-32/+59
| |
| * Support for maps in the MRI C Ruby extension.Chris Fallin2015-01-0612-163/+1873
| | | | | | | | | | | | | | | | This adds the Map container and support for parsing and serializing maps in the protobuf wire format (as defined by the C++ implementation, with MapEntry submessages in a repeated field). JSON map serialization/parsing are not yet supported as these will require some changes to upb as well.
* | Merge pull request #160 from zhangkun83/masterFeng Xiao2015-01-122-0/+88
|\ \ | |/ |/| Include names.h as java_names.h in the opensource tree
| * Align backslash verticallyzhangkun832015-01-121-1/+1
| |
| * Include names.h as java_names.h in the opensource treezhangkun832015-01-122-0/+88
|/
* Merge pull request #143 from Ivoz/patch-1Feng Xiao2014-12-221-2/+2
|\ | | | | Update python version / setuptools instructions
| * Update python version / setuptools instructionsMatt Iversen2014-12-171-2/+2
| | | | | | | | | | Reflect the change that protobuf should now only be supporting 2.6+ (I'd guess note python 3.x+ when its supported in implementation) Refer to the Python Packaging User Guide for installing setuptools (and pip) instead of out of date telecommunity guide.
* | Merge pull request #46 from adalq/versionFeng Xiao2014-12-201-0/+35
|\ \ | | | | | | Add __version__
| * | Updated __version__Adal Chiriliuc2014-12-141-1/+1
| | |
| * | Add __version__Adal Chiriliuc2014-10-101-0/+35
| | | | | | | | | | | | | | | | | | | | | | | | Added __version__ attr to package so that scripts that check local packages to see if newer versions are available can work. Almost all Python packages have a version attr, and the vast majority of them name it "__version__"
| * | Revert "Add __version__"Adal Chiriliuc2014-10-102-35/+0
| | | | | | | | | | | | This reverts commit 5337cf564f5eb43c1975d1cfd87b4efba9e6bf35.
| * | Add __version__Adal Chiriliuc2014-10-102-0/+35
| | | | | | | | | | | | | | | | | | | | | | | | Added __version__ attr to package so that scripts that check local packages to see if newer versions are available can work. Almost all Python packages have a version attr, and the vast majority of them name it "__version__"
* | | Merge pull request #139 from c0nk/masterFeng Xiao2014-12-201-1/+2
|\ \ \ | |_|/ |/| | Improved little endian byte order detection
| * | 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.
* | Merge pull request #136 from cfallin/ruby-proto3-onlyJoshua Haberman2014-12-121-0/+8
|\ \ | | | | | | Support Ruby code generation only for proto3.
| * | 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
| |
* | Update ruby DIST_FILES.Feng Xiao2014-12-121-9/+16
| |
* | Adds Travis Cl support to test the code automatically.Feng Xiao2014-12-122-0/+6
| |
* | Merge pull request #134 from cfallin/masterJoshua Haberman2014-12-1220-62/+17557
|\ \ | | | | | | Update Ruby build setup to produce gems successfully. Include upb as a single .c / .h file.
| * | Rename protobuf Ruby module to google/protobuf and rework its buildChris Fallin2014-12-1220-62/+17557
|/ / | | | | | | | | | | 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'.
* | 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
| | |