Commit Graph

3993 Commits

Author SHA1 Message Date
Joshua Haberman
b5bbdb0967 Merge pull request #2037 from abscondment/fix-2036-ruby-hash
Fix #2036 (Ruby `hash` broken for Messages with repeated fields.)
2016-09-18 21:38:51 -07:00
Feng Xiao
c44ca26fe8 Merge pull request #2130 from kilink/substring-comment-fix
Fix erroneous comment regarding String.substring
2016-09-16 17:07:57 -07:00
Patrick Strawderman
9ac84f8f3f Fix erroneous comment regarding String.substring
Since Java 7, Strings produced with String.substring do not share byte arrays.
2016-09-16 14:54:58 -07:00
Bo Yang
3b001ca6ba Some php engine implementation doesn't have return_value_ptr properly set. Explicitly use &return_value. 2016-09-15 17:59:49 -07:00
Bo Yang
c6fa9c71a5 Auto-generate proto files for tests. 2016-09-15 17:59:49 -07:00
Bo Yang
f174d36380 Add back missing test proto files. 2016-09-15 17:59:49 -07:00
Jisi Liu
37e0e1ff86 Merge pull request #2111 from pherl/3.0.x
Fix the version number for 3.0.2
2016-09-15 15:01:59 -07:00
Jisi Liu
9c4be5f654 Merge pull request #2112 from pherl/merge
Merge 3.0.x into master
2016-09-15 14:37:38 -07:00
Thomas Van Lenten
b4235ac79c Merge pull request #2123 from thomasvl/objc_better_versioning_take2
Update the ObjC version checks to support a min and current version.
2016-09-15 17:36:08 -04:00
Thomas Van Lenten
1aa6500056 Update the ObjC version checks to support a min and current version.
- Capture the version used to generated.
- Check at compile time and runtime that generated code isn't from a newer
  version, also check that the min version required is also supported.
- Keep the old constants/macros/functions to special case the last version
  that was working so those generated sources still work until we decide
  otherwise.
2016-09-15 17:22:51 -04:00
Paul Yang
e0e54661f7 Check in php implementation. (#2052)
This pull request includes two implementation: C extension and PHP
package. Both implementations support encode/decode of singular,
repeated and map fields.
2016-09-15 11:09:01 -07:00
Jisi Liu
683412b23f Update generated files. 2016-09-14 10:27:22 -07:00
Jisi Liu
58860c021f Merge remote-tracking branch 'origin/3.0.x' into merge 2016-09-14 09:37:48 -07:00
Jisi Liu
13d6d17262 Fix the version number for 3.0.2 2016-09-13 11:36:19 -07:00
Feng Xiao
86fcd879b3 Merge pull request #1765 from mbarbon/master
Add https://metacpan.org/pod/Google::ProtocolBuffers::Dynamic
2016-09-12 20:45:28 -07:00
Feng Xiao
1affbd8717 Merge pull request #2021 from zlim/bench-fix
benchmarks: update readme.txt
2016-09-12 16:08:16 -07:00
Feng Xiao
4f032cd9af Merge pull request #2100 from vladmos/patch-1
Compatibility with the new version of Bazel.
2016-09-12 10:02:39 -07:00
Feng Xiao
22e7fa6aef Merge pull request #2092 from dprotaso/master
Allow the JsonFormat.Parser to ignore unknown fields
2016-09-12 09:53:27 -07:00
Vladimir Moskva
5caf516976 Resolved a conflict 2016-09-12 11:27:28 +02:00
Feng Xiao
78aee1b15f Merge pull request #2044 from wychen/Win32ANSI
Fix Win32 error messages on Unicode build
2016-09-09 16:46:50 -07:00
Jisi Liu
643a02bc9c Merge pull request #1636 from yugui/feature/generic-plugin
Generalize plugin support in Bazel Skylark rule
2016-09-09 15:00:25 -07:00
Feng Xiao
53387e5f55 Merge pull request #2090 from guoxiao/find
include std::find()
2016-09-09 12:44:34 -07:00
Feng Xiao
e90292b2a6 Merge pull request #2103 from adrianludwin/fix-gtest
Update repo in Bazel build files to use googletest instead of the deprecated gMock
2016-09-09 11:54:49 -07:00
Adrian Ludwin
1327e6f470 Update repo to use google test 2016-09-09 13:10:56 -04:00
Thomas Van Lenten
7377eb2b03 Merge pull request #1970 from thomasvl/objc_any_helpers
Objc any helpers
2016-09-09 11:02:09 -04:00
Vladimir Moskva
a86e6d8db2 Compatibility with the new version of Bazel.
Global variable HOST_CFG is deprecated and will not be supported soon.
2016-09-09 13:21:35 +02:00
Thomas Van Lenten
5d35e60900 Merge pull request #2094 from thomasvl/update_wkt_comments
Fix error and add note about lossy issues
2016-09-08 17:02:43 -04:00
Jisi Liu
57170b9343 Merge pull request #2096 from pherl/3.0.x
Cherry pick objc test changes into 3.0.x branch
2016-09-08 12:49:55 -07:00
Thomas Van Lenten
5699b920bf More complete nil/reset tests within a oneof 2016-09-08 12:45:20 -07:00
Thomas Van Lenten
708296e583 Fix some constants to be correct for the message class in use. 2016-09-08 12:44:11 -07:00
Thomas Van Lenten
161b937740 Fix error and add note about lossy issues 2016-09-08 15:34:42 -04:00
Sergio Campamá
14e74f6a21 Support the -Wassign-enum compiler flag. (#2085)
Support the -Wassign-enum compiler flag.
2016-09-08 15:15:12 -04:00
Dave Protasowski
1fc416be21 Allow the JsonFormat.Parser to ignore unknown fields
The default behaviour of throwing an exception remains
2016-09-08 15:08:30 -04:00
Jisi Liu
a15df74146 Merge pull request #2087 from khingblue/fix-unused-param
Fix #2032 unused parameter 'deterministic'
2016-09-08 10:15:38 -07:00
Thomas Van Lenten
337ec3065f Add ObjC helpers for Any WKT.
- Capture the ObjC prefix used when generating the the file.
- Track the containing type on descriptors.
- Mark descriptors where the message class name got a suffix added to it.
- Expose a fullName property on Descriptors.
- Add helpers for packing/unpacking Any messages.
- Bump the ObjC runtime version number. Since we added methods and invoke them
  in the generated code, ensure the code is running against a matching version.
  Otherwise, someone could compile against headers, but run with a framework
  that is older and get unknown selector failures.  This should trip clearer
  messaging.

Fixes https://github.com/google/protobuf/issues/1674
2016-09-08 11:59:57 -04:00
Guo Xiao
82133ba00b include std::find() 2016-09-08 21:33:18 +08:00
Khing
08b1c718e4 Fix #2032 unused parameter 'deterministic'
Parameter deterministic is unused in
InternalSerializeWithCachedSizesToArray(), which generates unused
parameter warning in every message.
2016-09-08 10:56:21 +10:00
Feng Xiao
4bc1657853 Merge pull request #2079 from khingblue/fix-generate-descriptor
Fix #2071 replacing /bin/sh with bash when generates descriptor
2016-09-07 14:56:31 -07:00
Jisi Liu
30e55aecc1 Merge pull request #2083 from pherl/3.0.x
Merge pull request #1884 from hochhaus/valueWriterFn
2016-09-07 10:55:02 -07:00
Joshua Haberman
7645a3d03d Merge pull request #1884 from hochhaus/valueWriterFn
Fix valueWriterFn_ variable name
2016-09-07 10:15:10 -07:00
Khing
f9fc56c42a Fix #2071 replacing /bin/sh with bash
On Ubuntu /bin/sh is dash by default, this can cause
generate_descriptor_proto.sh fail to execute.
2016-09-07 14:46:50 +10:00
Jisi Liu
1a58673508 Merge pull request #2077 from pherl/3.0.x
Update release date in the change log
2016-09-06 15:40:51 -07:00
Jisi Liu
e298ce5fd0 Update release date in the change log 2016-09-06 14:37:35 -07:00
Joshua Haberman
74638a253e Merge pull request #2047 from jonathon-love/master
Fix to typo/oversight in reflection tests
2016-09-06 11:14:15 -07:00
Jisi Liu
65a595dea8 Merge pull request #2062 from pherl/3.0.2
Bump version number to 3.0.2
2016-09-06 10:30:22 -07:00
Jisi Liu
01d1750477 Merge pull request #2061 from pherl/changelog
Changelog update for 3.0.2
2016-09-06 10:30:14 -07:00
Guillaume Turri
9b8da104c1 Rm check on dependency in the C# reflection API (#2051)
This check adds a few constraints on the way to build a project when we have
a proto file which imports another one. In particular, on projects which
build both C# and Java, it's easy to end up with exceptions like

    Expected: included.proto but was src/main/protobuf/included.proto

A user may work around this issue, but it may add unnecessary constraints
on the layout of the project.

According to f3504cf3b1 (diff-ecb0b909ed572381a1c8d1994f09a948R309)
it has already been considered to get rid of this check, for
similar considerations, and because it doesn't exist in the Java code
2016-09-05 09:29:03 +01:00
Feng Xiao
96a9d97352 Merge pull request #2059 from chih-hung/master
Fix #1955 clang-tidy warning misc-macro-parentheses
2016-09-02 15:38:03 -07:00
Chih-Hung Hsieh
7c3f7c6a09 Fix #1955 clang-tidy warning misc-macro-parentheses
clang-tidy gives warning "macro argument should be enclosed in
parentheses" to macro ZR_, the "first" parameter.
2016-09-02 15:28:42 -07:00
Jisi Liu
6e11540b32 Bump version number to 3.0.2 2016-09-02 11:57:49 -07:00