aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/google
Commit message (Collapse)AuthorAge
* Add missing includesGravatar Julien Brianceau2016-12-13
| | | | | This changes fixes "use of undeclared identifier 'INT_MAX'" compilation error.
* Merge pull request #2471 from jbrianceau/fix-include-styleGravatar Feng Xiao2016-12-12
|\ | | | | Fix #include in cc files
* \ Merge pull request #2454 from pongad/go_packageGravatar Feng Xiao2016-12-12
|\ \ | | | | | | update descriptor.proto's go_package
* | | Use uint32 in GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET macroGravatar Adam Cozzette2016-12-09
| | | | | | | | | | | | | | | | | | | | | There have been some reports that this necessary to prevent build failures in some environments. It makes sense to do this anyway since the result of this macro is ultimately assigned to uint32 in the generated code.
| | * Fix #include in cc filesGravatar Julien Brianceau2016-12-09
| |/ |/|
* | Update commit id in Dockerfile to trigger update. (#2467)Gravatar Paul Yang2016-12-08
| |
* | Merge pull request #2462 from jbrianceau/fix-comp-builds-part2Gravatar Feng Xiao2016-12-08
|\ \ | | | | | | C++: export _xxx_default_instance_ symbols
* \ \ Merge pull request #2461 from jbrianceau/add-missing-include-in-embed-ccGravatar Feng Xiao2016-12-08
|\ \ \ | | | | | | | | Add missing include in embed.cc
* | | | Make php generated code conform to PSR-4. (#2435)Gravatar Paul Yang2016-12-08
| | | | | | | | | | | | | | | | 1. Generate single file for each message. 2. Lazily initiate metadata.
* | | | Improve ObjC deprecated annotation support.Gravatar Thomas Van Lenten2016-12-08
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Check the parent file options for deprecation when deciding to tag Messages and Enums as deprecated. - Within the generated source push/pop the warning for implementing deprecated things around a deprecated class implementation. - Annotate the methods generated for extension fields as deprecated. - Add a testing .proto file that covers deprecated fields, messages, enums, enum values and compile it into the unittests to confirm things compile cleanly. - Add a testing .proto file that uses the file level option to make everything deprecated and compile it into the unittests to confirm things compile cleanly.
| | * | Regenerate descriptor protoGravatar Julien Brianceau2016-12-08
| | | |
| | * | C++: export _xxx_default_instance_ symbolsGravatar Julien Brianceau2016-12-08
| |/ / |/| | | | | | | | | | | _xxx_default_instance_ symbols are used in inline functions. We have to export them to avoid undefined reference link errors.
| * | Add missing include in embed.ccGravatar Julien Brianceau2016-12-08
|/ / | | | | | | | | This changes fixes "use of undeclared identifier 'assert'" compilation error.
* | Send all protobuf logging to logcat by default on AndroidGravatar Adam Cozzette2016-12-07
| | | | | | | | | | | | | | | | | | | | | | Currently the default for protobuf on Android is to silently drop all log messages. This makes debugging difficult because things like GOOGLE_LOG(FATAL) will crash the process without actually logging a useful error. This CL changes the logging so that by default we send messages for all log levels to logcat (and stderr). Users can override this by setting GOOGLE_PROTOBUF_MIN_LOG_LEVEL. Also, that option was not being respected for non-Android platforms so I went ahead and fixed that to make things consistent.
* | Export symbols used in inline functionsGravatar Julien Brianceau2016-12-07
| | | | | | | | | | fixed_address_empty_string symbol is used in an inline function. We have to export it to avoid undefined reference link errors.
| * update descriptor.proto's go_packageGravatar Michael Darakananda2016-12-07
|/ | | | | This change has already been made in google's repo. Replicating the change here to unblock work on genproto.
* Merge pull request #2437 from xfxyjwf/pluginGravatar Feng Xiao2016-12-06
|\ | | | | Add version number to plugin protocol.
| * Add version number to plugin protocol.Gravatar Feng Xiao2016-12-05
| |
* | Merge pull request #2445 from ramrunner/masterGravatar Feng Xiao2016-12-05
|\ \ | | | | | | OpenBSD correct endianess handling
| * | when on OpenBSD we include the correct headers for endianess and check the ↵Gravatar ramrunner2016-12-05
| | | | | | | | | | | | apropriate defines
* | | Factored Conformance and Benchmark test messages into shared test schema. ↵Gravatar Joshua Haberman2016-12-03
| |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (#1971) * Factored Conformance test messages into shared test schema. * Updated benchmarks to use new proto3 message locations. * Fixed include path. * Conformance: fixed include of Python test messages. * Make maven in Rakefile use --batch-mode. * Revert changes to benchmarks. On second thought I think a separate schema for CPU benchmarking makes sense. * Try regenerating C# protos for new test protos. * Removed benchmark messages from test proto. * Added Jon Skeet's fixes for C#. * Removed duplicate/old test messages C# file. * C# fixes for test schema move. * Fixed C# to use the correct TestAllTypes message. * Fixes for Objective C test schema move. * Added missing EXTRA_DIST file.
* | Generate phpdoc in php generated files. (#2406)Gravatar Paul Yang2016-12-01
| |
* | Add a swift_prefix file option.Gravatar Thomas Van Lenten2016-11-30
| | | | | | | | | | | | | | | | Swift generators should default to CamelCasing the proto package and prefixing symbols with that, but this option allows developers to override that behavior with something custom if they desire. Fixes https://github.com/google/protobuf/issues/1833
* | Merge pull request #2403 from google/down-integrate-with-msvc-fixGravatar Adam Cozzette2016-11-23
|\ \ | | | | | | Integrated internal changes from Google
| * | Add a "u" suffix to tag numbers in generated codeGravatar Adam Cozzette2016-11-22
| | | | | | | | | | | | | | | | | | This seems to be necessary to prevent warnings in some compiler configurations, particularly for tag numbers that are too large to fit in a signed 32-bit int.
* | | C++: Fix use with GOOGLE_PROTOBUF_NO_STATIC_INITIALIZERGravatar Julien Brianceau2016-11-21
| | | | | | | | | | | | | | | | | | | | | Behavior of define GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER has been altered between 337a028 and cc8ca5b for C++. See github issue #2385 for further details.
| * | Add back missing LIBPROTOBUF_EXPORT.Gravatar Feng Xiao2016-11-17
| | |
| * | Merge branch 'master' into down-integrate-with-msvc-fixGravatar Adam Cozzette2016-11-17
| |\ \ | |/ / |/| |
| * | Integrated internal changes from GoogleGravatar Adam Cozzette2016-11-17
| | |
* | | Add LL to large constantGravatar zhsyourai2016-11-18
| | | | | | | | | Some compiler will report: 'error: integer constant is too large for long type'
* | | Rename Empty to GPBEmpty in php generated file.Gravatar Paul Yang2016-11-16
| | | | | | | | | | | | In php, class name cannot be "Empty". Modified code generator to (#2375) generate GPBEmpty instead (for google.protobuf.Empty only). Also change runtime code to work with the new generated code accordingly.
* | | Merge pull request #2367 from jbrianceau/add-missing-include-in-message-lite-ccGravatar Adam Cozzette2016-11-16
|\ \ \ | | | | | | | | Add missing include in message_lite.cc
| * | | Add missing include in message_lite.ccGravatar Julien Brianceau2016-11-14
| | | | | | | | | | | | | | | | | | | | This changes fixes "use of undeclared identifier 'INT_MAX'" compilation error.
* | | | Fix #include in js_generator.ccGravatar Julien Brianceau2016-11-14
|/ / / | | | | | | | | | Reland commit f2885f6 that has been trampled by commit d64a2d99.
* | | Resolve old TODO for StringTypeHandler.Gravatar Chris Kennelly2016-11-11
| | | | | | | | | | | | | | | StringSpaceUsedExcludingSelf has been part of the lite library since b913cbd.
* | | Merge pull request #2353 from guptasu/masterGravatar Feng Xiao2016-11-11
|\ \ \ | | | | | | | | MessageOptions should handle both proto2 and google.protobuf package names.
* \ \ \ Merge pull request #2337 from sergiocampama/deprecationGravatar Feng Xiao2016-11-10
|\ \ \ \ | | | | | | | | | | Fixes deprecation warnings/errors on Xcode
| | * | | Made helper code also consider package name 'proto2' when dealing with ↵Gravatar guptasu2016-11-10
| |/ / / |/| | | | | | | | | | | | | | | | | | | MessageOptions. This is done so that the same library can be used irrespective of whether MessageOptions belong to package name 'proto2' or 'google.protobuf'
| * | | Renamed the pnacl version of atomicops.h into C11 atomic, and flagged the ↵Gravatar Sergio Campama2016-11-07
| | | | | | | | | | | | | | | | mac version to that if atomic is enabled
* | | | Added explicit cast to avoid size warning on Win64.Gravatar Rodrigo Hernandez2016-11-04
|/ / /
* | | Fix unused parameter warnings in arena_freeGravatar Adam Cozzette2016-11-04
| | | | | | | | | | | | | | | | | | The size parameter is only used in cases where the compiler supports sized delete, so when that's not available we need to specifically cast it to void to prevent a warning.
* | | Merge pull request #2301 from jbrianceau/arm-atomic-kuser-helpers-fix-v2Gravatar Feng Xiao2016-11-03
|\ \ \ | | | | | | | | [arm/gcc] Don't rely on KUSER_HELPERS feature for atomics
* \ \ \ Merge pull request #2302 from jbrianceau/generic-gcc-atomics-strong-cmpxchgGravatar Jisi Liu2016-11-02
|\ \ \ \ | | | | | | | | | | generic atomicops: Use strong compare_exchange
* | | | | Fix compiler warnings when running :protobuf_testGravatar Michael Avrukin2016-11-02
| | | | | | | | | | | | | | | When running >bazel test :protobuf_test a few compiler warnings came up. They were centered around the usage of "int" as the loop counter where the value should have been a size_t.
| * | | | generic atomicops: Use strong compare_exchangeGravatar Julien Brianceau2016-10-28
|/ / / / | | | | | | | | | | | | | | | | Weak compare-and-exchange are allowed to fail spuriously, so we have to use the strong variation here.
| * / / [arm/gcc] Don't rely on KUSER_HELPERS feature for atomicsGravatar Julien Brianceau2016-10-28
|/ / / | | | | | | | | | | | | | | | ARM specific CONFIG_KUSER_HELPERS feature can be disabled in Linux kernel, and in this case, we shouldn't crash. Use gcc built-in functions instead of arm specific code if they are available.
* | / define no_threadlocal on OpenBSDGravatar ramrunner2016-10-26
| |/ |/|
* | Add comments about converting directives into PluginNameGravatar Jisi Liu2016-10-26
| |
* | Support extra parameters for plugins.Gravatar Jisi Liu2016-10-25
| |
* | Merge 3.1.x into master.Gravatar Bo Yang2016-10-13
|\ \ | |/ |/|