AuroraMiddleware/protobuf
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity
1,382 Commits 35 Branches 138 Tags 124 MiB
ec2f244554
Commit Graph

470 Commits

Author SHA1 Message Date
Brian Duff
ec2f244554 Fix bug with large extension field numbers. 
Previously, extensions with field numbers greater than 268435455 would
result in a compile time error in generated code that looks something
like this:

Foo.java:3178: error: integer number too large: 3346754610
                3346754610);

This is because we were trying to represent the tag number (an
unsigned int) using a java int constant, but java int constants are
signed, and can't exceed Integer.MAX_VALUE.

Fixed by declaring it as a long instead, and casting it down to an
int in the implementation. This is safe, because the tag value always
fits in 32 bis.

Change-Id: If2017bacb4e20af667eaeaf9b65ddc2c30a7709f
 2015-04-28 11:42:01 -07:00
Feng Xiao
ca9d1a053a Include all well-known type protos. 
Change-Id: I122f1cee71a8a739ea603e52582cb0fa9698f0ed
 2015-04-20 11:30:31 -07:00
Tamir Duberstein
9f42f5f4a4 [PYTHON] Drop dependency on 'google.apputils'. 
Use stdlib's 'unittest' instead.
 2015-04-10 19:43:51 -04:00
Tamir Duberstein
53bee665f8 Change fixture name to be consistent 
This fixes the problem where `make check` generates files not ignored
by `.gitignore`.
 2015-03-31 10:21:49 -07:00
Kenton Varda
60df829ae4 Delete "SEBS" (aka: Clean up Kenton's old trash) 
The file `SEBS` is a build file for a toy build system I was writing in my spare time six years ago, back when I maintained protobufs. Arguably it was never appropriate for me to have placed this file in the protobuf tree, but it was convenient at the time and didn't seem to hurt anything. It clearly doesn't belong here now, though.
 2015-03-26 17:13:15 -07:00
Tamir Duberstein
ed715048c6 Add OS X to travis; fix tests to pass on OS X 2015-03-18 00:43:34 -07:00
Jisi Liu
813d6d652d Merge pull request #228 from cconroy/sanitize-enums 
Sanitize Enum names from collisions with reserved words.
 2015-03-16 15:48:06 -07:00
Chris Conroy
0d77c824e7 Sanitize Enum names from collisions with reserved words. 2015-03-16 18:42:26 -04:00
Bo Yang
12a91417fb Revert pull request 175: Add support for the TILE-Gx processor family. 2015-03-14 14:14:26 -07:00
Feng Xiao
9d31c227a3 Add a missing proto file. 
Change-Id: Ic98584616bd6ee49680273f0cdbe6d9c038ec0e9
 2015-03-13 17:06:10 -07:00
Paul Yang
a5f7bb8ebb Merge pull request #193 from TeBoring/sb 
Implement a feature to generate a dependency file
 2015-03-09 06:49:58 +08:00
Jisi Liu
6c8a036e3e Fix tile atomicops macro. 
Change-Id: I1a3acadd059f87c26a2e26f3b7a169c0780e981e
 2015-03-05 16:25:30 -08:00
Jisi Liu
0ddbafab2a Merge pull request #175 from martiert/tile-support 
Add support for the TILE-Gx processor family.
 2015-03-05 14:57:14 -08:00
Jisi Liu
329fa02b42 Initialize data members in constructors instead of direct initialize in 
class definition, which is a C++11 extension.

Change-Id: I477fe484d737f4c60c519d68f431940ffaa33431
 2015-03-01 21:34:49 -08:00
Jisi Liu
f0e8df3b66 use is_proto_enum instead of is_enum for repeated accessor field. 
The later is not supported by some versions of MSVC and the former is
more accurate for the use case.

Change-Id: I7096226b1ebfef8340d288bbaf2788540aa3e97f
 2015-03-01 21:18:34 -08:00
Jisi Liu
4065a31644 Fix hash.h for MSVC and platforms without hash map/set support. 
Change-Id: Ic0fdb52c17b9495c73b8ce15879531383a148585
 2015-03-01 21:02:22 -08:00
Jisi Liu
14fe0c99bb Fix hash_map type parameter to add Alloc for other platforms. 
Change-Id: Idc5fb65a2cc469d55aff6f2cde0b51b326be0963
 2015-03-01 19:51:58 -08:00
Jisi Liu
0a25cfe69d Use portable GOOGLE_PROTOBUF_THREAD_LOCAL instead of __thread. 
Change-Id: Iaa75f8333541bc378bea699e7f147c7f17b652ad
 2015-03-01 19:44:46 -08:00
Jisi Liu
885b612f74 Down integrate from Google internal branch for C++ and Java. 
- Maps for C++ lite
- C++ Arena optimizations.
- Java Lite runtime code size optimization.

Change-Id: I7537a4357c1cb385d23f9e8aa7ffdfeefe079f13
 2015-02-28 17:06:49 -08:00
Jisi Liu
7e9020fb0e Merge pull request #185 from mzhaom/remove-unused 
Remove unused methods:
 2015-02-26 12:46:53 -08:00
Jisi Liu
a779ae609c Merge pull request #199 from google/wkt 
Add the .proto files for well-known types.
 2015-02-26 10:04:37 -08:00
Jisi Liu
97dacc44af Fix the order of BUILT_FILES so that pbconfig.h will be built before 
anyother targets.

Change-Id: I507009cd92a711739d7d58ccee93dfbf0a9fe135
 2015-02-25 22:23:55 -08:00
Jisi Liu
a86baaa256 Exclude pbconfg.h from dist, otherwise it breaks VS builds. 
Change-Id: I7f745929b137b93c122448a4a2d9a7bbab6648d6
 2015-02-25 20:39:13 -08:00
Jisi Liu
f8e7a46bc2 Merge pull request #221 from google/python_proto3 
Proto3 Python changes for v3.0.0-alpha-2
 2015-02-25 20:35:29 -08:00
Josh Haberman
0b70a43736 Fixes for Python/C++ implementation in open-source: 
* Rosy hack doesn't apply (that test should be removed
    for the open-source release).

  * Added our own copy of parameterized.py (the open-source
    version of Google Apputils doesn't contain it).

  * The C++ Descriptor object didn't implement extension_ranges.

  * Had to implement a hack around returning EncodeError, to
    work around the module-loading behavior of the test runner.
 2015-02-25 20:17:32 -08:00
Jisi Liu
b67096072b Include shared_ptr.h into headers to make maps proto work. It is used 
in the map_field_inl.h

Change-Id: Ieeaab5507ee34b317d76b5937beb67c298905eb4
 2015-02-25 17:09:55 -08:00
Jisi Liu
ada6556785 Down integrate from Google internal. 
Change-Id: I34d301133eea9c6f3a822c47d1f91e136fd33145
 2015-02-25 16:39:11 -08:00
Jisi Liu
df184fba00 Make maps fields work on installed C++ protobufs. 
Change-Id: Id937e25bbb35968ee76c92bd4a8ce6247408c443
 2015-02-25 15:56:58 -08:00
Jisi Liu
e70329c6c0 Propogate onChange() event when getFooBuilder() is on an oneof message 
field.

Change-Id: Idb5b53da5accd24038a895aba49b684eeee95814
 2015-02-23 17:24:36 -08:00
Jisi Liu
7a00a1e424 Add shutdown code for several newly introduced leaks; 
Disable commandline interface test for heap check tests.

Change-Id: I02aa2ad9704e3c70dcecae8b3b3557b18607d455
 2015-02-21 17:45:36 -08:00
Jisi Liu
7c43f1700c Use static_cast instead of dynamic_cast in arena unittest so that it can 
pass in systems without rtti.

Change-Id: Ib32b47a66f14928de9399c49dbdb07263a30d1bc
 2015-02-20 16:21:04 -08:00
Jisi Liu
a6fc5da0fc Fix review comments. 
Change-Id: Iafd4a3aa9d55e31478bf070311eeadfe95ece4d7
 2015-02-19 17:16:26 -08:00
Jisi Liu
f2cf6cdcb2 Remove the unused set common oneof variables in helper 2015-02-19 16:43:08 -08:00
Jisi Liu
7b72a24a20 fix equal and hash for bytes field for javanano oneof 2015-02-19 16:43:08 -08:00
Jisi Liu
3accf81ea9 Clear oneofs. 2015-02-19 16:43:08 -08:00
Jisi Liu
f173cdeb02 hashcode and equals for oneofs in nano. 2015-02-19 16:43:08 -08:00
Jisi Liu
06a2e29855 Equals for message oneof field in nano. 2015-02-19 16:43:07 -08:00
Jisi Liu
c72d3d51ff Oneof message level elements (consts, case getter/clear) and messsage type field oneof support. 2015-02-19 16:43:07 -08:00
Jisi Liu
7794a98ff4 Initial check-in for message oneof. 2015-02-19 16:43:07 -08:00
Jisi Liu
33222b5a02 Initial check in for primitive oneof fields. 2015-02-19 16:43:07 -08:00
Josh Haberman
55cf8abecb Merge branch 'master' of github.com:google/protobuf 2015-02-17 18:25:20 -08:00
Josh Haberman
cb3caf1e61 Integrate changes from Google open-source branch. 2015-02-17 18:23:41 -08:00
Jisi Liu
2cb2358cba Merge pull request #204 from pherl/master 
Implement maps for JavaNano
 2015-02-17 14:06:19 -08:00
Chris Fallin
a2bea0a001 Properly support maps in Ruby protoc and another bugfix. 
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.
 2015-02-12 16:08:01 -08:00
Bo Yang
eb2ce02931 Fix absolute/relative path in output 2015-02-09 11:57:41 -08:00
Gordana Cmiljanovic
b61b0c3304 MIPS: remove immediate constraint within CompareAndSwap. 
Improper use of immediate constraint is slightly non-optimal with gcc/gnu-as
but may cause breakage with clang.
 2015-02-09 14:04:24 +01:00
Feng Xiao
96e379ff8b Add the .proto files for well-known types. 2015-02-09 12:21:49 +08:00
Nobuaki Sukegawa
de525ec219 Add missing LIBPROTOC_EXPORT to ruby generator 2015-02-08 14:45:38 +09:00
Bo Yang
e2555e235f Change target to output filenames 2015-02-07 15:28:54 -08:00
Jisi Liu
12d8a514c8 Get the map factory per mergeFrom() call for JavaNano. 2015-02-07 12:51:36 -08:00