Commit Graph

5376 Commits

Author SHA1 Message Date
Yilun Chong
1c062a65af Sync internal benchmark changes 2017-12-01 11:55:38 -08:00
Adam Cozzette
5d647e19e7 Updated Makefile.am to add a new file to EXTRA_DIST 2017-12-01 11:22:17 -08:00
Adam Cozzette
0ba8eea655 Merge branch 'master' into down-integrate 2017-12-01 10:05:19 -08:00
Adam Cozzette
92a7e778e7 Integrated internal changes from Google 2017-12-01 10:05:10 -08:00
Adam Cozzette
a711e3d5b4
Merge pull request #3979 from acozzette/3.5.x-merge
Merge 3.5.x branch into master
2017-12-01 07:31:37 -08:00
Adam Cozzette
a27da09339 Merge branch '3.5.x' into 3.5.x-merge 2017-11-30 13:34:51 -08:00
Paul Yang
94bb1eed17
Remove duplicate typedef. (#3975) 2017-11-30 12:21:00 -08:00
Paul Yang
74e7decbbf
Provide discardUnknonwnFields API in php (#3976)
* Provide discardUnknownFields API in php implementation

* Provide discardUnknownFields API in php c extension.
2017-11-30 12:19:50 -08:00
Feng Xiao
6de51caed5
Merge pull request #3824 from anuraaga/dev_rag
[Java] Add a UTF-8 decoder that uses Unsafe to directly decode a byte buffer.
2017-11-30 11:03:46 -08:00
Feng Xiao
da89eb25ef
Merge pull request #3955 from linux-on-ibm-z/master
Adding Release_CompareAndSwap 64-bit variant
2017-11-30 10:44:11 -08:00
Jie Luo
6d6099553b
Update csharp version number (#3958) 2017-11-29 16:10:44 -08:00
Joshua Haberman
0289dd8f90
Merge pull request #2519 from rubynerd-forks/ruby-fix-repeated-message-type-field
unwrap descriptor class before comparison of RepeatedField types
2017-11-29 10:07:35 -08:00
Jon Skeet
74f64b667c Fix JsonTokenizer exception message 2017-11-29 07:14:57 +00:00
Anuraag Agrawal
3e944aec9e Add a UTF-8 decoder that uses Unsafe to directly decode a byte buffer. 2017-11-29 15:44:58 +09:00
Adam Cozzette
3c6fd3f7f9
Merge pull request #3960 from acozzette/libprotoc-export-fix
Added back in LIBPROTOC_EXPORT which was removed by mistake
2017-11-28 16:54:55 -08:00
Adam Cozzette
1b1d1ea340 Added back in LIBPROTOC_EXPORT which was removed by mistake 2017-11-28 07:28:26 -08:00
Adam Cozzette
34e30e5c1b
Merge pull request #3962 from jleni/fix_dotnet
Upgrading dotnet to 1.0.4
2017-11-28 07:23:31 -08:00
Juan Leni
582d6ac3aa Upgrading dotnet to 1.0.4 2017-11-28 05:18:25 +01:00
Jisi Liu
f2127b667e
Merge pull request #3416 from xiaoshuang-lu/PROTOBUF-3404
[PROTOBUF-3404] add --with-zlib=PATH to configure.ac script
2017-11-27 09:45:36 -08:00
Nayana-ibm
642e1ac635 Adding Release_CompareAndSwap 64-bit variant 2017-11-27 05:43:30 -05:00
Xiaoshuang LU
8ff2284456 [PROTOBUF-3404] add --with-zlib=PATH to configure.ac script 2017-11-23 10:53:31 +08:00
Jisi Liu
cf65a7946f Update version for 3.5.0.post1 2017-11-22 14:05:10 -08:00
Jisi Liu
f466709e7d
Merge pull request #3941 from google/anandolee-patch-2
Add _file_desc_by_toplevel_extension back
2017-11-22 14:01:02 -08:00
Jie Luo
45d99a15f3
Add _file_desc_by_toplevel_extension back
Add _file_desc_by_toplevel_extension back for compatibility issue with 3.4.1.

_file_desc_by_toplevel_extension is a temporary solution for FieldDescriptor.file.
FieldDescriptor.file was added in code gen. However, we need to keep it for some time for compatibility reason (with 3.4.1 only). May try to remove it after 2 years.
2017-11-22 13:59:11 -08:00
Feng Xiao
f08e4dd984
Merge pull request #3919 from jart/less-warnings
Remove unhelpful build warnings
2017-11-21 10:46:44 -08:00
Feng Xiao
b819abf0b2
Merge pull request #3918 from OEP/fix-sdist
Include .cc and .h files in Python source distribution
2017-11-21 10:45:42 -08:00
Justine Tunney
ac5371d13e Remove unhelpful build warnings
-Wno-writable-strings removes 230 "ISO C++11 does not allow conversion from
string literal to 'char *'" warnings from TensorFlow test / build output.
These happen because pyext/ sources pass string literals to Python C API data
structures, e.g. PyGetSetDef, which for some reason were designed to not have
the const qualifier.
2017-11-17 18:40:05 -08:00
Paul Kilgo
9935829a66 Include .cc and .h files in source distribution 2017-11-17 15:30:31 -08:00
Thomas Van Lenten
baed06e694 Small code reorder to maybe make #3893 happy.
Use the ivar for the -open, so hopefully it lines up with the -close
in dealloc and isn't seen as an unbalanced "open".
2017-11-17 12:32:22 -05:00
Thomas Van Lenten
6700f41c4b Travis config cleanups and move ObjC to Xcode 9.1.
Stop having travis build the test matrix and make it explicit so extra
settings are only on the test that need the, this helps make the travis
UI a little cleaner (linux hosted stuff doesn't list an Xcode version),
as well as avoid unneeded requirements limiting the travis pool something
can run on.

Small improvements to objectivec/DevTools/full_mac_build.sh to avoid some
repeated scripting and hopefully make things more reliable work with Xcode
9.x.

Don't mark the iOS tests as able to fail, hopefully with the new settings
they are stable and won't give false signals.

Simplify the case for xcode versions and fixup xcode 9.[0-1].
2017-11-16 21:46:46 -05:00
dmaclach
2b3aa1c294 Add Setter/Getter type verification. (#3880)
Add runtime asserts (that can be disabled in release) that verify
that the types being get/set for messages using the C Api match
the type in the descriptor for the field being get/set.
2017-11-16 08:26:46 -05:00
dmaclach
8537f1e6d5 Fix up warnings from Xcode 9.1 (#3887)
Fix up warnings from Xcode 9.1
2017-11-16 08:24:17 -05:00
Paul Yang
98836a56e6
Update version number for php c extension (#3896) 2017-11-15 17:17:36 -08:00
Jisi Liu
e99e5d093f
Merge pull request #3895 from pherl/3.5.x
Add protobuf-all in post release
2017-11-15 15:11:08 -08:00
Jisi Liu
1ec45f81ef Add protobuf-all in post release 2017-11-15 15:06:47 -08:00
Paul Yang
857a021645
Use fully qualifed name for DescriptorPool in Any.php to avoid name (#3886)
conflict
2017-11-15 11:09:14 -08:00
Issac Trotts
0d466884a2 Update README.md: C extension works on PHP 7 (#3888)
Here's the pull request that made it happen: https://github.com/google/protobuf/pull/2951
2017-11-15 11:08:15 -08:00
Thomas Van Lenten
696653d246
Merge pull request #3892 from sergiocampama/32bit
Fixes 32bit tests.
2017-11-15 13:42:33 -05:00
Feng Xiao
7daa320065
Merge pull request #3878 from Yangqing/master
Allow one to omit building libprotoc and protoc binaries
2017-11-15 10:37:58 -08:00
Sergio Campama
02129f0a87 Fixes 32bit tests. 2017-11-15 13:14:41 -05:00
Thomas Van Lenten
cf685313f1
Merge pull request #3891 from thomasvl/travis_cleanups
Travis cleanups
2017-11-15 12:46:42 -05:00
Thomas Van Lenten
7417755e40
Merge pull request #3883 from dmaclach/map_optimizations
Reduce size of GPBDictionary by getting rid of class creation methods
2017-11-15 11:52:57 -05:00
Dave MacLachlan
8ae6844cf4 codereview cleanup 2017-11-15 08:49:59 -08:00
Thomas Van Lenten
6552c5af3f
Merge pull request #3884 from dmaclach/unsafe
Simplify getter/setter method implementations
2017-11-15 11:45:32 -05:00
Dave MacLachlan
4ba30923fa code review cleanup 2017-11-15 08:41:29 -08:00
Thomas Van Lenten
af5ad24617
Merge pull request #3882 from dmaclach/removeclass2
Remove unreferenced 'GPBMessageSignatureProtocol' class.
2017-11-15 11:02:34 -05:00
Thomas Van Lenten
a839c67dfe Remove the allowed_failure for python_cpp as the bug was fixed. 2017-11-15 10:39:35 -05:00
Thomas Van Lenten
2e17639133 Remove the ruby tests from travis configs.
Looking at tarvis history for master, jruby doesn't look like it has passed
in a really long time.  The other two tests have been failing for a few weeks.
Since travis has limited osx hosts, seems better to just remove things we
aren't expecting to pass.
2017-11-15 10:36:49 -05:00
Thomas Van Lenten
c46571bc17 Update some comments about testing. 2017-11-15 10:31:16 -05:00
Thomas Van Lenten
73e8c8aab9 Instead of listing and then excluding osx builds, just don't list them. 2017-11-15 10:29:14 -05:00