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

3452 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jon Skeet
371d341c7e Merge pull request #1518 from jskeet/move_test 
Move test for standalone BoolValue to JsonParserTest
 2016-05-12 10:04:38 +01:00
Feng Xiao
920ee735cf Merge pull request #1483 from wal-rus/fix-boost-incompatibility 
Fix C++ Boost incompatibility on Windows/MSVC
 2016-05-11 10:30:41 -07:00
Jon Skeet
7cc9cb407b Move test for standalone BoolValue to JsonParserTest 
Also added a standalone formatter test, for confidence.
Have validated that undoing the change in 835fb947 breaks the tests
(i.e. we are still testing that the change is required).
 2016-05-11 18:07:03 +01:00
Jon Skeet
cca2d44ef1 Merge pull request #1517 from jhickson/boolvalue 
Fix C# Json parsing of well-known type Boolvalue
 2016-05-11 17:23:08 +01:00
Jos Hickson
835fb947cc Fixed parsing of BoolValue. 2016-05-11 15:36:02 +01:00
Jos Hickson
2b22b611a8 Merge remote-tracking branch 'refs/remotes/google/master' 2016-05-11 09:23:46 +01:00
Thomas Van Lenten
a1938b2aa9 Merge pull request #1510 from thomasvl/nonnull 
Declare an init and avoid passing NULL to initWithValue:count:
 2016-05-10 11:24:56 -04:00
Thomas Van Lenten
4755bdc5f9 Declare an init and avoid passing NULL to initWithValue:count: 
Fixes https://github.com/google/protobuf/issues/1189
 2016-05-10 11:15:51 -04:00
Joshua Haberman
4c6259bbe8 Merge pull request #1498 from thomasvl/build_cleanup 
Build cleanup
 2016-05-09 13:27:27 -07:00
Walter Gray
f4bc9e0ddb Remove confounding and unused #define - breaks boost/predef/other/endian.h 2016-05-06 17:13:02 -07:00
Jisi Liu
d392ed4577 Merge pull request #1502 from pherl/master 
Remove accidentally restored deleted files.
 2016-05-06 16:25:39 -07:00
Jisi Liu
ce6bec74fd Remove accidentally restored deleted files. 2016-05-06 15:57:06 -07:00
Jisi Liu
9d0f56058a Merge pull request #1494 from pherl/master 
Fix the std::string error introduced in integration.
 2016-05-06 15:40:58 -07:00
Feng Xiao
76a96d4690 Merge pull request #1499 from beardedN5rd/master 
updated README
 2016-05-06 15:23:45 -07:00
beardedn5rd
2eb774e602 after comment of Feng Xiao changed the entry to g++ 2016-05-06 22:47:17 +02:00
Feng Xiao
ace2690be1 Merge pull request #1496 from ozkuran/master 
Updated README.md
 2016-05-06 13:36:37 -07:00
Thomas Van Lenten
b661fb5000 Add the missing maintiner-clean entry for benchmarks 2016-05-06 12:47:41 -04:00
Thomas Van Lenten
ce2ef0d705 Properly express all outputs for the conformance build 
- Fixes up `make distclean` and `make maintainer-clean`
- Fixes the build so make is more likely to notice if one of those files is stale/missing.
 2016-05-06 12:41:23 -04:00
Thomas Van Lenten
f367642103 Add two missing ignores for conformance directory. 2016-05-06 11:44:42 -04:00
beardedn5rd
b12f630e81 updated README 2016-05-06 14:49:52 +02:00
Mahmut Ali ÖZKURAN
9b3357ddac Updated README.md 
Added relative link to cmake guide.
 2016-05-06 10:16:28 +03:00
Jon Skeet
5b5e369b18 Merge pull request #1471 from jskeet/any-host 
Allow custom type URL prefixes in Any.Pack
 2016-05-06 06:29:03 +01:00
Jisi Liu
f8a5c5f746 Fix using std::shared_ptr 2016-05-05 16:34:42 -07:00
Jisi Liu
75e5898513 Fix the std::string error introduced in integration. 2016-05-05 16:04:30 -07:00
Feng Xiao
17b6fc31eb Merge pull request #1409 from eeight/fix_enum_corruption 
Fix bug with silent message corruption in LITE_RUNTIME.
 2016-05-04 10:55:13 -07:00
Joshua Haberman
72e162ce96 Merge pull request #1482 from nicolasnoble/rake-tweaks-2 
Properly generating well known proto files for the macos build.
 2016-05-03 17:57:53 -07:00
Nicolas "Pixel" Noble
edd29498f4 Properly generating well known proto files for the macos build. 2016-05-04 02:40:25 +02:00
Joshua Haberman
07bcf21a9c Merge pull request #1464 from google/benchmarks 
Added framework for generating/consuming benchmarking data sets.
 2016-05-03 13:11:20 -07:00
Joshua Haberman
7dda312224 Merge pull request #1473 from nicolasnoble/rake-tweaks 
Few tweaks to the rakefile to permit native gems compilation with the proto files generation.
 2016-05-03 13:10:02 -07:00
Josh Haberman
247ef1f0df Addressed PR comments. 2016-05-03 12:53:49 -07:00
Jisi Liu
09f1757cf5 Merge pull request #1467 from pherl/master 
Merge Google internal changes
 2016-04-30 20:36:00 -07:00
Nicolas "Pixel" Noble
236b93937f Addressing concerns. 2016-04-30 02:15:15 +02:00
Jisi Liu
e0df23ac14 Update descritpor protos for objc 2016-04-29 11:41:38 -07:00
Thomas Van Lenten
aed7b345fa Merge pull request #1474 from pherl/fixscript 
Fix cp -r usage to be portable.
 2016-04-29 14:37:53 -04:00
Jisi Liu
454d5be8d3 Merge the script fix. 2016-04-29 11:35:59 -07:00
Jisi Liu
cf7e99db96 Fix cp -r usage to be portable. 
cp -r foo/ bar/ in linux will create a bar/foo directoy. In the
objectivec generate descritpor case, well known types will be created in
objectivec/google/google/protobuf/.. if the command is run under linux.

Adding the trailing period fixes the behavior inconsistency.
 2016-04-29 11:31:57 -07:00
Nicolas "Pixel" Noble
1f8b6da920 Few tweaks to the rakefile to permit native gems compilation with the proto files generation. 2016-04-29 20:00:43 +02:00
Josh Haberman
b2d4b1a528 Fixed for pre-C++11 ifstream which does not accept std::string. 2016-04-29 10:25:52 -07:00
Josh Haberman
49a8918e97 Read files directly from filesystem since xxd isn't always available. 2016-04-29 10:19:03 -07:00
Josh Haberman
cb36bde047 Make the C++ tests build the benchmarking code. 2016-04-29 09:52:20 -07:00
Josh Haberman
1ce5bd8e84 Updates for PR comments. 2016-04-29 09:39:26 -07:00
Jon Skeet
61307b86f5 Allow custom type URL prefixes in Any.Pack 
(And likewise ignore the prefix in unpack.)

Fixes issue #1459.
 2016-04-29 10:20:03 +01:00
Jisi Liu
f86d39c295 Update file lists. 2016-04-28 14:43:22 -07:00
Jisi Liu
12fdeb9b41 Merge branch 'master' of github.com:google/protobuf 2016-04-28 14:43:08 -07:00
Jisi Liu
cf14183bcd Down integrate from Google internal. 2016-04-28 14:34:59 -07:00
Adam Cozzette
b53417c735 Merge pull request #1462 from acozzette/ruby-2.3 
Added dig and bsearch_index to RepeatedField methods forwarded to array
 2016-04-28 08:26:26 -07:00
Josh Haberman
30a2f70eb3 Added README describing the directory. 2016-04-27 18:34:33 -07:00
Josh Haberman
2e83110230 Added framework for generating/consuming benchmarking data sets. 
This takes the code that was sitting in benchmarks/
already and makes it easier for language-specific
benchmarks to consume.  Future PRs will enhance this
so that the language-specific benchmarks can report
metrics back that will be tracked over time in PerfKit.
 2016-04-27 18:22:22 -07:00
Thomas Van Lenten
cbb6b285d7 Merge pull request #1461 from thomasvl/fix_bool_handing 
Fix up -hash/-isEqual: for bool storage.
 2016-04-27 16:09:06 -04:00
Thomas Van Lenten
30646288ad Fix up -hash/-isEqual: for bool storage. 
Both methods weren't checking the has_bits (where the bools are stored), so
it resulted in invalid results.

Add a test that should shake out something like this in the future also.
 2016-04-27 13:57:11 -04:00