Commit Graph

4569 Commits

Author SHA1 Message Date
Feng Xiao
d2dfe46b27 Merge pull request #2609 from yixiang/patch-1
Undef TYPE_BOOL to avoid conflict with iOS.
2017-02-13 17:03:55 -08:00
Jie Luo
3f6f73b796 Merge pull request #2701 from anandolee/master
Add csharp compatibility tests against v3.0.0
2017-02-13 10:54:34 -08:00
Feng Xiao
ed423c2c52 Merge pull request #2451 from podsvirov/json-primitive-map
JsonUtilTest: Add ParsePrimitiveMapIn subtest
2017-02-13 10:46:40 -08:00
Feng Xiao
aa78aeba98 Merge pull request #2704 from liutikas/master
Fix compiler warnings about unused variables in wire_format.h
2017-02-13 10:26:09 -08:00
Paul Yang
74eb9a0a30 Add clear method to PHP message (#2700) 2017-02-11 16:36:17 -08:00
Konstantin Podsvirov
46c022a0a9 JsonUtilTest: Add ParsePrimitiveMapIn subtest 2017-02-11 03:39:53 +03:00
Aurimas Liutikas
9079079ec0 Fix compiler warnings about unused variables in wire_format.h 2017-02-10 16:23:49 -08:00
Jonathan Hseu
ef927cc428 Switch to gcc atomic intrinsics for macOS and delete the file that uses (#2699)
the deprecated atomics.
2017-02-10 14:55:34 -08:00
Jie Luo
7288689d8c Add csharp compatibility tests against v3.0.0 and run on Travis. 2017-02-10 13:40:16 -08:00
Feng Xiao
1d2736f24d Merge pull request #2656 from pcj/patch-1
Add bazel protobuf resources
2017-02-10 10:47:48 -08:00
Jie Luo
9f09d1804a Add proto and test files for csharp compatibility tests against v3.0.0.
All the files are copied from 3.0.0 (JosnFormaterTest was deleted)
2017-02-09 16:43:18 -08:00
Jie Luo
c6e0d0e7f3 Merge pull request #2647 from anandolee/master
Fix python compatibility test
2017-02-09 16:32:08 -08:00
Jie Luo
42e1e2abef Fix python compatibility test when a new generated code imports an old version(2.6.1 or older) generated code. 2017-02-09 11:08:10 -08:00
Feng Xiao
e844510f44 Merge pull request #2692 from cgrushko/patch-3
Update load() statement to latest style
2017-02-08 13:02:18 -08:00
cgrushko
65a4d20deb Update load() statement to latest style
The first argument is currently implicitly a .bzl file.
Change this to be explicit.
2017-02-08 15:23:57 -05:00
Feng Xiao
a60cc08d83 Merge pull request #2691 from cgrushko/patch-3
Bazel can build protobuf when it's not in the root
2017-02-08 10:45:47 -08:00
Paul Yang
cba04b19e8 Implement json encoding decoding for php. (#2682) 2017-02-08 10:27:54 -08:00
cgrushko
6fffd4adb4 Bazel can build protobuf when it's not in the root
That is, Bazel can now build protobuf when the latter resides in a subdirectory of a project.
2017-02-08 12:19:40 -05:00
Chris Kennelly
56da82820e Avoid aliasing CodedInputStream::buffer_ when parsing little endian integers.
This eliminates an unnecessary reload of buffer_ that occurs (before
this change) after the store to *value.
2017-02-07 17:41:16 -08:00
Paul Yang
c00274313d Add fixed version to phpunit used in travis (#2673) 2017-02-07 10:55:48 -08:00
Thomas Van Lenten
36f51f963c Merge pull request #2681 from sergiocampama/spaces
Removes trailing whitespaces
2017-02-07 11:59:59 -05:00
Sergio Campama
e7f5c9d071 Removes trailing whitespaces 2017-02-07 11:57:53 -05:00
Paul Yang
5a3405c51a Update upb for php. (#2662) 2017-02-06 12:40:51 -08:00
Jon Skeet
bd29f86804 Fix CopyTo argument validation
Fixes #2669.
2017-02-06 18:24:19 +00:00
Chris Kennelly
36f68e02d5 Inline branch-less VarintSize32/VarintSize64 implementations. 2017-02-02 16:33:02 -08:00
Paul Yang
39756643df Add conformance test for php (#2655) 2017-02-01 12:47:58 -08:00
Paul Cody Johnston
7b54b34c1e Add bazel protobuf resources 2017-02-01 07:16:22 -07:00
Paul Yang
7f3e237071 Merge 3.2.x branch into master (#2648)
* Down-integrate internal changes to github.

* Update conformance test failure list.

* Explicitly import used class in nano test to avoid random test fail.

* Update _GNUC_VER to use the correct implementation of atomic operation
on Mac.

* maps_test.js: check whether Symbol is defined before using it (#2524)

Symbol is not yet available on older versions of Node.js and so this
test fails with them. This change just directly checks whether Symbol is
available before we try to use it.

* Added well_known_types_embed.cc to CLEANFILES so that it gets cleaned up

* Updated Makefile.am to fix out-of-tree builds

* Added Bazel genrule for generating well_known_types_embed.cc

In pull request #2517 I made this change for the CMake and autotools
builds but forgot to do it for the Bazel build.

* Update _GNUC_VER to use the correct implementation of atomic operation on Mac.

* Add new js file in extra dist.

* Bump version number to 3.2.0

* Fixed issue with autoloading - Invalid paths (#2538)

* PHP fix int64 decoding (#2516)

* fix int64 decoding

* fix int64 decoding + tests

* Fix int64 decoding on 32-bit machines.

* Fix warning in compiler/js/embed.cc

embed.cc: In function ‘std::string CEscape(const string&)’:
embed.cc:51:32: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
   for (int i = 0; i < str.size(); ++i) {
                                ^

* Fix include in auto-generated well_known_types_embed.cc

Restore include style fix (e3da722) that has been trampled by
auto-generation of well_known_types_embed.cc

* Fixed cross compilations with the Autotools build

Pull request #2517 caused cross compilations to start failing, because
the js_embed binary was being built to run on the target platform
instead of on the build machine. This change updates the Autotools build
to use the AX_PROG_CXX_FOR_BUILD macro to find a suitable compiler for
the build machine and always use that when building js_embed.

* Minor fix for autocreated object repeated fields and maps.

- If setting/clearing a repeated field/map that was objects, check the class
  before checking the autocreator.
- Just to be paranoid, don’t mutate within copy/mutableCopy for the autocreated
  classes to ensure there is less chance of issues if someone does something
  really crazy threading wise.
- Some more tests for the internal AutocreatedArray/AutocreatedDictionary
  classes to ensure things are working as expected.
- Add Xcode 8.2 to the full_mac_build.sh supported list.

* Fix generation of extending nested messages in JavaScript (#2439)

* Fix generation of extending nested messages in JavaScript

* Added missing test8.proto to build

* Fix generated code when there is no namespace but there is enum definition.

* Decoding unknown field should succeed.

* Add embed.cc in src/Makefile.am to fix dist check.

* Fixed "make distcheck" for the Autotools build

To make the test pass I needed to fix out-of-tree builds and update
EXTRA_DIST and CLEANFILES.

* Remove redundent embed.cc from src/Makefile.am

* Update version number to 3.2.0-rc.1 (#2578)

* Change protoc-artifacts version to 3.2.0-rc.1

* Update version number to 3.2.0rc2

* Update change logs for 3.2.0 release.

* Update php README

* Update upb, fixes some bugs (including a hash table problem). (#2611)

* Update upb, fixes some bugs (including a hash table problem).

* Ruby: added a test for the previous hash table corruption.

Verified that this triggers the bug in the currently released
version.

* Ruby: bugfix for SEGV.

* Ruby: removed old code for dup'ing defs.

* Reverting deployment target to 7.0 (#2618)

The Protobuf library doesn’t require the 7.1 deployment target so
reverting it back to 7.0

* Fix typo that breaks builds on big-endian (#2632)

* Bump version number to 3.2.0
2017-01-31 09:17:32 -08:00
Joshua Haberman
9d3288e651 Merge pull request #2226 from kchodorow/master
Create paths for external repositories in a way that is forward and backward compatible
2017-01-30 13:45:34 -08:00
Alex Ausch
2c36cc30dd cache generated classes, optimization and quick workaround to memory leak 2017-01-30 15:42:01 -05:00
Jon Skeet
afc59ab55a C#: Implement IReadOnlyList<T> in RepeatedField<T>
We explicitly don't do this when targeting .NET 3.5, where the
interface doesn't exist.

No implementation is required, as we're already implementing
everything we need for IList<T>.
2017-01-30 18:58:56 +00:00
Jie Luo
87e4976ba4 Merge pull request #2639 from anandolee/master
Add Oneof custom options test
2017-01-28 15:31:43 -08:00
michaelpengcn
a83ac8663f fix compile error on centos in metadata.h for constructors. (#2599) 2017-01-27 16:40:53 -08:00
Paul Yang
a323f1e65d Oneof accessor should return the field name that is actually set. (#2631) 2017-01-27 13:17:54 -08:00
Jie Luo
ccb76fff44 Add Oneof custom options test 2017-01-27 11:52:32 -08:00
Jie Luo
5af0b547de Merge pull request #2619 from anandolee/master
Add python compatibility tests against v2.5.0
2017-01-27 10:18:35 -08:00
Jie Luo
1f09786229 Merge pull request #2633 from anandolee/jieluo_branch1
Allow OneofOptions to be extended in proto3.
2017-01-26 14:00:08 -08:00
Jie Luo
ea51149100 Add python compatibility tests against v2.5.0 amd run on Travis. 2017-01-26 11:05:16 -08:00
Jie Luo
c15217f922 Allow OneofOptions to be extended in proto3. 2017-01-25 16:22:15 -08:00
Thomas Van Lenten
c2a5669773 Merge pull request #2626 from sergiocampama/8_3
Adds nullability modifiers to resolve Xcode 8.3 warnings

Fixes #2625
2017-01-25 17:45:17 -05:00
Daniel Ylitalo
32fa55e666 FreeBSD compatibility 2017-01-25 22:04:11 +01:00
Kristina Chodorow
4e7ecde15c Update genfiles paths to work with a different execroot arrangement
Bazel is changing the way the execution root is organized (see https://github.com/bazelbuild/bazel/issues/1681
for details) and this updates the protobuf path logic to work with both old
and new versions of Bazel.
2017-01-25 14:10:56 -05:00
Sergio Campama
3d7b42d1a6 Adds nullability modifiers to resolve Xcode 8.3 warnings 2017-01-25 11:58:17 -05:00
Jie Luo
140e28d12e Add python compatibility tests against v2.5.0: copy tests and proto files from v2.5.0 2017-01-23 15:05:19 -08:00
Adam Cozzette
0aa5af3e68 Merge pull request #2614 from acozzette/gzip-output-stream-options
Set LIBPROTOBUF_EXPORT on GzipOutputStream::Options
2017-01-23 09:51:29 -08:00
Adam Cozzette
a101fa5289 Set LIBPROTOBUF_EXPORT on GzipOutputStream::Options
This fixes issue #2610.
2017-01-20 15:39:34 -08:00
Sean Lu
e41b667da5 Undef TYPE_BOOL to avoid conflict with iOS.
TYPE_BOOL is defined as a macro in <ConditionalMacros.h>, which gets implicitly included in almost all iOS source files.

This fixes complaints like http://go/soverflow/15759559

For some context, here is how TYPE_BOOL is defined in ConditionalMacros.h

  #ifdef __cplusplus
     #define TYPE_BOOL                1
  #else
     #define TYPE_BOOL                0
  #endif
2017-01-19 11:56:08 -08:00
Jon Skeet
047575f20c Support custom options in C#
This consists of:
- Changing the codegen for the fixed set of options protos, to parse unknown fields instead of skipping them
- Add a new CustomOptions type in the C# support library
- Expose CustomOptions properties from the immutable proto wrappers in the support library

Only single-value options are currently supported, and fetching options values requires getting the type right
and knowing the field number. Both of these can be addressed at a later time.

Fixes #2143, at least as a first pass.
2017-01-19 06:46:04 +00:00
Thomas Van Lenten
eed9951991 Merge pull request #2591 from thomasvl/objc_timestamps_take2
Timestamp helper fix, Duration helper cleanup.
2017-01-17 10:10:17 -05:00
goorov
24908e1b32 Update AbstractMessage.java
Apply review's comments.
2017-01-13 10:33:42 +03:00