Commit Graph

6312 Commits

Author SHA1 Message Date
Adam Cozzette
897c2a2216
Merge pull request #5349 from Allen-Webb/master
cpp_generator: Add generator options for --cpp_out.
2018-11-14 10:26:33 -08:00
Thomas Van Lenten
c0bc265b67 Fix up the Xcode project.
The builds were failing under Xcode 10 because of the new build system.
Even when reverted to the old build system, the build was failing
on the analyzer and swift bridging header, so it seems the general
logic for searching for things was changed in a way the setting does
not always cover.

- Disable HeaderMaps.
- Set user header search paths instead of system search paths.
- Turn off always search user paths (now recommended).

Tested in Xcode 10.1 and 9.4.1; both are able to build/pass with this.
2018-11-14 12:32:02 -05:00
Allen Webb
375d32d3eb cpp_generator: Add support for --cpp_out=speed:...
Previously --cpp_out:lite was available to force the optimization mode
to the lite runtime. This adds --cpp_out=speed:...
which is needed to override the file specific options in cases where
libprotobuf-mutator is used for fuzzing since it depends on reflection.

Signed-off-by: Allen Webb <allenwebb@google.com>
2018-11-13 15:35:20 -08:00
Adam Cozzette
2f28980f07
Merge pull request #5323 from aconchillo/cpp-generator-nullptr
compiler/cpp: replace NULL with nullptr
2018-11-13 11:41:12 -08:00
Aleix Conchillo Flaque
83ddea02bd compiler/cpp: replace NULL with nullptr
This avoids compiler errors/warnings if zero-as-null-pointer-constant is
considered an error or warning.
2018-11-13 10:47:31 -08:00
Adam Cozzette
cf900534a7 Removed stubs/singleton.h
This header is no longer used, so we can delete it. I also tweaked
Makefile.am to fix the distcheck test.
2018-11-13 10:28:49 -08:00
Jon Skeet
627cc48f5a Increase C# default recursion limit to 100 (#5339)
* Increase C# default recursion limit to 100

This matches the Java and C++ defaults.

* Change compatibility tests to use execution-time default recursion limit

This way the same tests should pass against all versions, even
if the recursion limit changes. (The tests will be testing whether
different messages work, admittedly - but that's probably fine.)
2018-11-13 10:21:30 -08:00
Adam Cozzette
ebfc0432c1
Merge pull request #5296 from janisozaur/patch-2
Add missing include guard to zip_writer.h
2018-11-12 14:05:18 -08:00
Adam Cozzette
46a48e49aa
Merge pull request #5332 from acozzette/integrate
Integrated internal changes from Google
2018-11-12 13:55:00 -08:00
Michał Janiszewski
75a1850853 Remove superfluous const from return type in json_stream_parser.h (#5295) 2018-11-12 13:44:10 -08:00
Adam Cozzette
1c2eba3eac
Merge pull request #5298 from rogerhub/patch-1
Import versions from @bazel_skylib//lib:versions.bzl
2018-11-12 13:36:15 -08:00
Elliotte Rusty Harold
398a47b90b java: add BOM (#5117) 2018-11-12 11:31:42 -08:00
Adam Cozzette
446e34ffc7
Merge pull request #5319 from jdef/patch-1
options: reserved extension range for CSI
2018-11-09 13:04:54 -08:00
Adam Cozzette
c81b4202d1 Fixed Java tests 2018-11-09 11:40:27 -08:00
Adam Cozzette
dbc644fcf0 Updated guava-testlib version in pom.xml 2018-11-09 11:40:27 -08:00
Adam Cozzette
fbd69fad43 Updated Makefiles 2018-11-09 11:40:27 -08:00
Adam Cozzette
24204c9c4f Added new JS test protos to gulpfile.js 2018-11-09 11:40:27 -08:00
Adam Cozzette
4dd45935d7 Removed scc.cc 2018-11-09 11:40:27 -08:00
Adam Cozzette
86d4fe47df Updated checked-in generated code 2018-11-09 11:35:34 -08:00
Adam Cozzette
b78c218af5 Merge branch 'master' into integrate 2018-11-09 11:28:27 -08:00
Adam Cozzette
0894e07536 Integrated internal changes from Google 2018-11-09 11:28:22 -08:00
Adam Cozzette
ce72041cdd
Merge pull request #5316 from zmodem/dllexport_build_fix
Add wire_format_lite_inl.h include to implicit_weak_message.cc
2018-11-08 14:11:09 -08:00
Dave MacLachlan
be83b29bdd Fix bugs in our keyword conversion support for objectivec
We have code for converting C/C++/Objc keywords that appear in protos
to convert them so that they can be compiled.
One of the things we need to be careful of is accidentally overriding methods
that Apple declares in NSObject. It turns out that we have run into issues
where we conflict with "hidden" methods in NSObject or methods added by
categories. method_dump.sh collects all of the methods we care about for
macOS and iOS and dumps them into objectivec_nsobject_methods.h which
is then included in objectivec_helpers.cc as part of the build.

Added a pile of tests to verify that conversions are happening as expected.
2018-11-08 10:29:03 -05:00
gerben-s
cd95c79149
Merge pull request #5261 from szakarias/dartExample
Add Dart example.
2018-11-06 07:36:21 -08:00
James DeFelice
4358133b85 options: reserved extension range for CSI 2018-11-06 09:01:59 +00:00
Hans Wennborg
5d8dd6b0ba Add wire_format_lite_inl.h include to implicit_weak_message.cc
This unbreaks the Windows shared-library build of Chrome when using
Clang versions based on r344987 or later, see https://crbug.com/901776

implicit_weak_message.cc is part of protobuf_lite.dll, and it includes
wire_format_lite.h, which includes the dllexport inline function
WireFormatLite::WriteGroupToArray which will therefore be emitted.

WriteGroupToArray in turn calls the inline function
InternalWriteGroupToArray, however that definition is provided in the
_inl file. To make sure the definition is available, the _inl file must
be included.

Before Clang r344987 the build worked anyway due to luck, because
InternalWriteGroupToArray was emitted into other object files (e.g. in
wire_format_lite.obj). After that Clang revision, those definitions
started getting inlined, and so are longer available and cause a link
failure for the reference from implicit_weak_message.obj.
2018-11-06 09:38:51 +01:00
Adam Cozzette
eaf672fda6
Merge pull request #5314 from nilslice/patch-1
3rd-party: include Protolock utility
2018-11-05 17:17:38 -08:00
Steve Manuel
6b10b916e0
include Protolock utility 2018-11-05 17:38:50 -07:00
Sydney Acksman
6f73c50936 C# Proto2 feature : Groups (#5183)
Add group support for proto2
2018-11-05 13:37:08 -08:00
Parveen Bhatia
29f27bfd0b Added safety checks when malloc returns nil in GPBDescriptor 2018-11-04 17:39:50 -05:00
Roger Chen
7492b56812 Import versions from @bazel_skylib//lib:versions.bzl
@bazel_skylib//:lib is supposedly deprecated. The 'versions' struct in lib.bzl was committed to bazel-skylib at the same time as //lib:versions.bzl, so there should be no backward incompatibility.
2018-11-02 23:13:17 -07:00
Thomas Van Lenten
eecccdc802 Let the 9.4 migrator migrate the Swift source.
No changes were needed, but since the Xcode projects pick up the updated
setting, the tests require a newer Xcode that supports Swift 4.

This is being done because Xcode 10 starting warning about Swift 3 support
going away in the future, so we might as well do the updates since most
folks shouldn't be on those really old Xcode versions any more.
2018-11-02 13:28:33 -04:00
Thomas Van Lenten
dde14310f4
Support suppressing the objc package prefix checks on a list of files. 2018-11-01 17:18:24 -04:00
Thomas Van Lenten
d52f2bb9e4 Add more Xcode versions to the objc build script. 2018-11-01 14:59:33 -04:00
Thomas Van Lenten
18aa296144 Collapse :protobuf_objc and :objectivec targets.
Not sure the history for why there were two objc_library targets, but
given the one has an issue about not working, merge them into a single
target and an alias.

- Use the alias for :objectivec since that naming doesn't seem to follow
  the other targets *_library targets here.
- Update :protobuf_objc to be use for the working target and just inline
  the sources/headers lists so there is less indirection in the file.

Fixes #5284
2018-11-01 12:52:18 -04:00
Adam Cozzette
96f7c5383f
Merge pull request #5297 from brian-peloton/master
Remove unused types
2018-10-31 09:48:53 -07:00
Brian Silverman
7834dbf820 Remove unused types
They're not doing anything, so might as well get rid of them.
2018-10-29 16:45:07 -07:00
Michał Janiszewski
e1fde520e0
Add missing include guard to zip_writer.h 2018-10-29 23:16:00 +01:00
Toby Hsieh
63d2f3bc80 Fix RepeatedField#first in Ruby gem (#5293)
Given an argument, the previous implementation was off by one
(`.first(2)` would return 3 elements) compared to the `Enumerable#first`
method.
2018-10-29 11:32:50 -07:00
Adam Cozzette
3025a06607
Merge pull request #5270 from Thomas-Barbier-1A/master
Fix error: unused parameter 'arena' [-Werror=unused-parameter]
2018-10-29 09:46:23 -07:00
micw523
0038ff49af Remove Debug Statement for Win/MinGW (#5283) 2018-10-23 12:50:57 -07:00
Sarah Zakarias
f075cacaf4 comments 2018-10-23 10:36:46 +02:00
Sarah Zakarias
bc00484bf7 comments and formatting 2018-10-23 09:52:44 +02:00
Paul Yang
acc0fc2a9e
Remove ruby21 and ruby22 tests (#5277)
* Remove ruby21 and ruby22 tests

* Update test badge
2018-10-22 15:09:36 -07:00
Adrián Nieto Rodríguez
31d6b4e30e Fix Javadoc typo (#5280) 2018-10-22 14:05:32 -07:00
Yilun Chong
565c26e7a1
Merge pull request #5186 from BSBandme/add_js_php_benchmark_to_dashboard
Add node and php to benchmark dashboard
2018-10-21 19:59:52 -07:00
Paul Yang
333b3ceab6
Add ruby 2.3, 2.4 and 2.5 test for linux. (#5256)
* Add ruby 2.3, 2.4 and 2.5 test for linux.

* Update kokoro files

* Add back commented gc test

* Fix gc_test failure

* Remove unused code

* Update ruby 2.5.0 to 2.5.1

* Update ruby 2.3 to 2.3.8

* Remove useless comment
2018-10-18 11:16:55 -07:00
Thomas BARBIER
403d216d5a Fix error: unused parameter 'arena' and 'default_value' [-Werror=unused-parameter] 2018-10-18 14:48:31 +02:00
Adam Cozzette
4e308267ac
Merge pull request #5260 from acozzette/common-h-includes
Removed unnecessary includes from stubs/common.h
2018-10-16 20:14:50 -07:00
Adam Cozzette
5e37bbf924 Removed unnecessary includes from stubs/common.h 2018-10-15 20:39:44 -07:00