Commit Graph

1173 Commits

Author SHA1 Message Date
Jisi Liu
12d8a514c8 Get the map factory per mergeFrom() call for JavaNano. 2015-02-07 12:51:36 -08:00
Jisi Liu
d9a6f27bc3 implement hashCode() for JavaNano maps. 2015-02-06 15:55:04 -08:00
Jisi Liu
1536e93349 Implement Equals for nano. 2015-02-06 15:30:48 -08:00
Jisi Liu
b0f194885e Rename empty bytes in JavaNano. 2015-02-05 17:38:07 -08:00
Jisi Liu
cd99c12df2 Rename readData() to readPrimitiveField() in JavaNano. 2015-02-05 17:14:02 -08:00
Jisi Liu
7f3693184a Add tests merging empty entries in JavaNano map 2015-02-05 15:23:37 -08:00
Jisi Liu
bd3573cb09 Fix the behavior when merging conflicting keys, the new value always
override the existing one even for message types.
2015-02-05 14:52:17 -08:00
Jisi Liu
ca35a80303 Test keys and values cannot be null. 2015-02-05 14:26:52 -08:00
Jisi Liu
0d52964597 Basic serialization/parsing test. 2015-02-05 14:19:46 -08:00
Jisi Liu
3c0355ef37 Moving internal code to InternalNano and rename MapUtil to MapFactories. 2015-02-04 13:54:58 -08:00
Jisi Liu
d5839d2b4d parsing and serialzation for maps in JavaNano. 2015-02-03 18:15:12 -08:00
Jisi Liu
4d64e65f09 Parsing for Maps in JavaNano 2015-02-02 21:06:59 -08:00
Jisi Liu
0f2a7d3fea Add readData(int) to read primitive value. 2015-02-02 21:06:04 -08:00
Jisi Liu
60bccb6006 MOVE TYPE_XXX constants to InternalNano. 2015-02-02 21:05:37 -08:00
Jisi Liu
4a99897c0b Use map generator for maps field; skip entry message. 2015-02-02 14:51:36 -08:00
Jisi Liu
ab74fd1c4b Add package for map test for nano. 2015-02-02 14:50:39 -08:00
Jisi Liu
03b1416f0e Add tests for JavaNano maps. 2015-02-02 14:30:24 -08:00
Jisi Liu
dce816593d Initial checkin for maps support in JavaNano. 2015-01-30 16:14:15 -08:00
Feng Xiao
76cb776d94 Merge pull request #180 from ned14/master
Fix illegal C++ use of reinterpret_cast<> to cast between nullptr_t and a pointer
2015-01-27 15:31:54 -08:00
Feng Xiao
ae11803d77 Delete unused files. 2015-01-27 11:17:18 -08:00
Niall Douglas (s [underscore] sourceforge {at} nedprod [dot] com)
f01c1441bc Fix illegal C++ use of reinterpret_cast<> to cast between nullptr_t and a pointer. 2015-01-27 15:44:38 +00:00
Joshua Haberman
5446deaea7 Merge pull request #155 from cfallin/ruby-maps
Support for maps in the MRI C Ruby extension.
2015-01-13 13:50:11 -08:00
Chris Fallin
ace4212e60 Line-wraps at 80 chars. 2015-01-13 13:47:58 -08:00
Feng Xiao
052e0205a7 Merge pull request #160 from zhangkun83/master
Include names.h as java_names.h in the opensource tree
2015-01-12 16:18:07 -08:00
Chris Fallin
addd26cbb3 Addressed code-review comments. 2015-01-12 16:09:35 -08:00
zhangkun83
a6b3ab09e8 Align backslash vertically 2015-01-12 15:56:07 -08:00
zhangkun83
aa1713d9a4 Include names.h as java_names.h in the opensource tree 2015-01-12 15:38:59 -08:00
Chris Fallin
97b663a8be Update upb amalgamation. 2015-01-09 16:15:22 -08:00
Chris Fallin
4c92289766 Addressed code-review comments. 2015-01-09 15:37:55 -08:00
Chris Fallin
80276ac021 Addressed code-review comments. 2015-01-06 18:01:32 -08:00
Chris Fallin
fd1a3ff11d Support for maps in the MRI C Ruby extension.
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.
2015-01-06 15:44:09 -08:00
Feng Xiao
644a6a1da7 Merge pull request #143 from Ivoz/patch-1
Update python version / setuptools instructions
2014-12-22 09:52:00 -08:00
Feng Xiao
b60a6df9ae Merge pull request #46 from adalq/version
Add __version__
2014-12-20 17:46:35 -08:00
Feng Xiao
bc3af606a7 Merge pull request #139 from c0nk/master
Improved little endian byte order detection
2014-12-20 17:43:04 -08:00
Matt Iversen
4186d4c9c9 Update python version / setuptools instructions
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.
2014-12-17 20:11:08 +11:00
Kal Conley
c3e928021f Improved little endian byte order detection
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.
2014-12-16 02:30:45 +01:00
Adal Chiriliuc
4f0170d465 Updated __version__ 2014-12-14 20:42:46 +02:00
Joshua Haberman
59692c3fc0 Merge pull request #136 from cfallin/ruby-proto3-only
Support Ruby code generation only for proto3.
2014-12-12 22:10:03 -08:00
Chris Fallin
5ce69e991a Support Ruby code generation only for proto3. 2014-12-12 18:27:19 -08:00
Feng Xiao
044e095a9b Add missing header files in src/Makefile.am 2014-12-12 17:50:43 -08:00
Feng Xiao
e7d562a242 Update ruby DIST_FILES. 2014-12-12 17:41:34 -08:00
Feng Xiao
0c7f6241e5 Adds Travis Cl support to test the code automatically. 2014-12-12 17:22:35 -08:00
Joshua Haberman
ed52203481 Merge pull request #134 from cfallin/master
Update Ruby build setup to produce gems successfully. Include upb as a single .c / .h file.
2014-12-12 16:49:45 -08:00
Chris Fallin
91473dcebf Rename protobuf Ruby module to google/protobuf and rework its build
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'.
2014-12-12 15:58:26 -08:00
Feng Xiao
f473bb9903 Merge pull request #128 from krishnanm86/master
Source code refactoring. Extracted common functionality in cpp_helpers.c...
2014-12-12 11:13:15 -08:00
Krishna
2e9f5e3bac Reverting the space at the end for both files changed 2014-12-12 10:26:25 +01:00
Krishna
91552adb77 Reverting the space at the end 2014-12-12 10:25:06 +01:00
Krishna
22f96a713c Returned print_indent and print_outdent back to printservicestub and printserviceclass in python generator 2014-12-12 10:22:48 +01:00
Feng Xiao
001e82a7e0 Merge pull request #113 from nsuke/oneof-c++11
Make C++ code generation of string oneof field compatible with C++11
2014-12-11 16:05:06 -08:00
Feng Xiao
78c8200655 Describe how to get gtest source for Visual Studio users. 2014-12-11 15:36:08 -08:00