organicmaps/protobuf
13
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity Actions
4660 commits 28 branches 36 tags 41 MiB
Commit graph

1252 commits

Author SHA1 Message Date
Silvio Traversaro
9094bf0f7e Export symbols used in inline functions 
fixed_address_empty_string symbol is used in an inline function.
We have to export it to avoid undefined reference link errors.
 2017-06-12 17:09:55 +02:00
Adam Cozzette
96095f3a85 Merge pull request #3176 from acozzette/fix-3114 
Ensure that for Java, imports of .proto files with empty packages works
 2017-06-07 15:15:34 -07:00
Paul Yang
6f325805c0 Add new file option php_namespace. (#3162) 
* Add new file option php_namespace.

Use this option to change the namespace of php generated classes.
Default is empty. When this option is empty, the package name will be
used for determining the namespace.

* Uncomment commented tests

* Revert gdb test change

* Update csharp descriptor.

* Add test for empty php_namespace.
 2017-06-05 00:10:18 -07:00
Adam Cozzette
e9c15d601e Ensure that for Java, imports of .proto files with empty packages works 
This fixes a compiler bug that caused a Java syntax error when one .proto file
would import another one with an empty package and java_package. This fixes
issue #3114.
 2017-06-02 13:45:57 -07:00
Wayne Zhang
d6470abef1 not to use std::random_device for map.Seed(). (#3133) 
* not to use std::random_device for map.Seed().

* remove include random
 2017-05-30 11:18:23 -07:00
Paul Yang
282fb9e68e Add ARRAY for reserved name (#3150) 2017-05-29 15:30:47 -07:00
Brent Shaffer
4d5daf4ef9 Adds fluent setters for PHP (#3130) 2017-05-29 10:39:14 -07:00
brian-peloton
40da1ed572 Removing undefined behavior and compiler warnings (#1315) 
* Comment out unused arguments.

These last few are all that's needed to compile with -Wunused-arguments.

* Fix missing struct field initializer.

With this fix, everything compiles with -Wmissing-field-initializers.

* Add support for disabling unaligned memory accesses on x86 too.

ubsan doesn't like these because they are technically undefined
behavior, so -DGOOGLE_PROTOBUF_DONT_USE_UNALIGNED will disable them easily.

* Avoid undefined integer overflow.

ubsan catches all of these.
 2017-05-23 16:22:57 -07:00
Dennis Cappendijk
3b227611d5 show help if protoc is called without any arguments, pre-empts -h and --help to show a useful message instead of just 'Missing input file.' 2017-05-22 16:21:48 +02:00
Mario J. Rugiero
cd0efc0024 Workaround gcc < 4.5.0 bug 
See https://gcc.gnu.org/bugzilla/show_bug.cgi?id=189

Signed-off-by: Mario J. Rugiero <mrugiero@gmail.com>
 2017-05-05 14:02:49 -03:00
Adam Cozzette
9053033a50 Merge remote-tracking branch 'remotes/google/3.3.x' into merge-3.3-to-master 2017-04-27 14:55:53 -07:00
Adam Cozzette
07c284f86c Fully qualify min as std::min in wire_format_lite.cc 2017-04-27 11:35:59 -07:00
Paul Yang
a6189acd18 Add prefix to enum value with reserved name. (#3020) 2017-04-26 16:32:21 -07:00
Adam Cozzette
cbd08cb7d1 Merge pull request #3018 from acozzette/using-namespace-std 
Remove "using namespace std" from stubs/common.h
 2017-04-26 13:56:24 -07:00
Adam Cozzette
7c76ac1735 Remove "using namespace std" from stubs/common.h 
This prevents the contents of the std namespace from being effectively
pulled into the top-level namespace in all translation units that
include common.h. I left in individual using statements for a few common
things like std::set and std::map, because it did not seem worth going
through the churn of updating the whole codebase to fix those right now.
 2017-04-26 08:25:01 -07:00
Jakob Buchgraber
b1c75bc742 Remove unused constants. 
When compiling with -Werror, -Wunused-const-variable the build fails due
to those two constants not being used.
 2017-04-25 12:49:00 +02:00
Paul Yang
4523c9c233 Allow proto files to import descriptor.proto (#2995) 
descriptor.proto uses proto2 syntax, which is not ready for external
usage. However, some proto3 files import descriptor.proto and cannot be
used. In this PR, all references (We cheated by only removing
extensions, which is enough for now. User should avoid using messages
defined in descriptor.proto as field type.) to content in
descriptor.proto are removed from generated files. Those that import
descriptor.proto can be used like other proto files.
 2017-04-20 16:55:56 -07:00
Paul Yang
4c57e8475f Prepend "PB" to generated classes whose name are reserved words. (#2990) 2017-04-20 01:19:03 -07:00
Paul Yang
7be088202b Enum defined without package have incorrect class name. (#2988) 
Fix the bug by sharing the code for generating class name for both
message and enum.
 2017-04-19 20:03:34 -07:00
Michael Allen
2240a785f9 Simplify the Element dtor invocation when freeing elements in 
InternalDeallocate to avoid confusing the compiler when there's
a class named Element already defined in the global namespace.
 2017-04-17 10:59:31 -07:00
Feng Xiao
5777259273 Cherry-pick cl/152450543 2017-04-11 16:15:46 -07:00
Feng Xiao
cad0258d17 Cherry-pick cl/151775298 2017-04-11 16:14:00 -07:00
Feng Xiao
fc3ea97870 Merge pull request #2955 from xfxyjwf/3.3.x 
Add include for INT_MAX
 2017-04-11 16:13:32 -07:00
Jie Luo
899460c9cb cherrypick descriptor_pool.FindFileContainingSymbol by extensions (#2962) 
* Use PyUnicode_AsEncodedString() instead of PyUnicode_AsEncodedObject()

* Cherrypick the fix descriptor_pool.FindFileContainingSymbol by extensions.
 2017-04-10 16:37:57 -07:00
Feng Xiao
bfeeb98517 Add include for INT_MAX 2017-04-08 00:39:03 +00:00
Anuraag Agrawal
bf483dfb99 Allow unknown values for Map put*Value methods just like every other enum mutation method. 2017-04-07 14:50:52 +09:00
Feng Xiao
ee9c7f17e9 Cleanup reflection objects for map entry. 2017-04-06 16:47:18 -07:00
Feng Xiao
21b0b3ca36 Update generated code. 2017-04-05 17:45:21 -07:00
Feng Xiao
80f0c0ac40 Update version number and changelog for 3.3.0 2017-04-05 17:32:17 -07:00
Feng Xiao
d5827784cf Fix C++ distcheck. 2017-03-30 17:43:45 -07:00
Feng Xiao
fe97d79abf Fix MSVC DLL build. 2017-03-30 23:54:39 +00:00
Feng Xiao
d36c0c538a Down-integrate from google3. 2017-03-29 14:33:05 -07:00
Juan David Dominguez
4a0dd03e52 Removes ignored const from return type (#2915) 
See https://github.com/google/protobuf/issues/2425
 2017-03-29 11:39:29 -07:00
drivehappy
d43eaf2b8f Fix gcc warning when using map (#2213) 
* Issue #2211: Addressing GCC warning on enumeral/non-enumeral in conditional expression.

* Updated per 80 character wrap.
 2017-03-28 16:57:19 -07:00
Adam Cozzette
f316375a95 Added a workaround to allow building for NaCl 
arm-nacl-clang seems to produce a mysterious compiler error when it
encounters __builtin_clzll, so when we are building for NaCl, let's
avoid that in favor of the portable implementation of
Log2FloorNonZero64.
 2017-03-28 09:45:14 -07:00
Joshua Haberman
d9e0119f2c Merge pull request #2858 from haberman/gopackage 
Changed go_package for plugin.proto.
 2017-03-27 12:04:08 -07:00
Adam Cozzette
ffa932bf10 Merge pull request #2861 from byronyi/#710 
migrate delimited messages functions to util package
 2017-03-20 13:02:40 -07:00
Feng Xiao
db3ef48ede Merge pull request #2860 from prehistoric-penguin/master 
Remove duplicated copyright statement
 2017-03-20 10:49:48 -07:00
Adam Cozzette
20181f6a1a Merge pull request #2854 from hesmar/attributesFix 
fix attributes warning
 2017-03-20 09:51:31 -07:00
Feng Xiao
15b60bccf8 Merge pull request #2867 from mojoBrendan/master 
Add preserve_proto_field_names option to JsonPrintOptions
 2017-03-17 15:05:58 -07:00
Jie Luo
c12cc3490b Merge pull request #2837 from anandolee/master 
DefaultValueObjectWriter should populate oneof message field
 2017-03-17 11:10:24 -07:00
Paul Yang
6b27c1f981 Add file option php_class_prefix (#2849) 
This option will be prepended to generated classes of all messages in
the containing file.
 2017-03-17 11:08:06 -07:00
Feng Xiao
c0871aa49c Merge pull request #2848 from xfxyjwf/freebsd 
Fix freebsd build.
 2017-03-17 10:42:20 -07:00
Bairen Yi
e8e6aa2864 Update delimited_message_util_test.cc 2017-03-18 00:32:43 +08:00
Brendan McCarthy
89eb4e51b2 Add option to preserve original proto field names 2017-03-17 22:47:38 +10:00
Brendan McCarthy
1eee3202fc Add use_snake_case_for_field_names option to JsonPrintOptions 2017-03-17 18:46:18 +10:00
Byron Yi
c415a1445b fix several issues 2017-03-17 10:00:59 +08:00
Josh Haberman
0df20284d0 Properly regenerated descriptor.proto. 2017-03-16 15:07:22 -07:00
Byron Yi
7008a88e2b add LIBPROTOBUF_EXPORT to make msvc happy 2017-03-16 20:35:35 +08:00
Byron Yi
cb3e84b78e migrate delimited messages functions to util package 2017-03-16 20:01:22 +08:00