aboutsummaryrefslogtreecommitdiff
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #2496 from xyzzyz/fix-overflowFeng Xiao2016-12-131-1/+1
|\ | | | | Fix integer overflow in FastUInt32ToBufferLeft
| * Fix integer overflow in FastUInt32ToBufferLeftAdam Michalik2016-12-131-1/+1
| | | | | | | | | | If digits > 2, and int is 32 bit, line 999 overflows. It has been fixed internally in CL 41203823.
* | Merge pull request #2493 from jbrianceau/add-missing-climits-includeFeng Xiao2016-12-133-0/+3
|\ \ | | | | | | Add missing includes
| * | Add missing include in embed.ccJulien Brianceau2016-12-131-0/+1
| | | | | | | | | | | | | | | This changes fixes "error C2039: 'getline': is not a member of 'std'" compilation error.
| * | Add missing includesJulien Brianceau2016-12-132-0/+2
| | | | | | | | | | | | | | | This changes fixes "use of undeclared identifier 'INT_MAX'" compilation error.
* | | Merge pull request #2484 from ngg/uwp_buildFeng Xiao2016-12-1316-94/+95
|\ \ \ | |_|/ |/| | Add support for Windows ARM builds
| * | Add support for Windows ARM buildsGergely Nagy2016-12-1216-94/+95
| | |
* | | Merge pull request #2487 from jtattermusch/csharp_leading_whitespaceJan Tattermusch2016-12-131-1/+1
|\ \ \ | |_|/ |/| | remove leading whitespace in C# xml comments
| * | remove leading whitespace in C# xml commentsJan Tattermusch2016-12-121-1/+1
| | |
* | | Merge pull request #2471 from jbrianceau/fix-include-styleFeng Xiao2016-12-121-1/+1
|\ \ \ | |_|/ |/| | Fix #include in cc files
| * | Fix #include in cc filesJulien Brianceau2016-12-091-1/+1
| | |
* | | Merge pull request #2454 from pongad/go_packageFeng Xiao2016-12-122-5/+6
|\ \ \ | |_|/ |/| | update descriptor.proto's go_package
| * | update descriptor.proto's go_packageMichael Darakananda2016-12-072-5/+6
| | | | | | | | | | | | | | | This change has already been made in google's repo. Replicating the change here to unblock work on genproto.
* | | Use uint32 in GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET macroAdam Cozzette2016-12-091-4/+4
| |/ |/| | | | | | | | | | | 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.
* | Update commit id in Dockerfile to trigger update. (#2467)Paul Yang2016-12-081-3/+0
| |
* | Merge pull request #2462 from jbrianceau/fix-comp-builds-part2Feng Xiao2016-12-0813-91/+94
|\ \ | | | | | | C++: export _xxx_default_instance_ symbols
| * | Regenerate descriptor protoJulien Brianceau2016-12-0812-88/+88
| | |
| * | C++: export _xxx_default_instance_ symbolsJulien Brianceau2016-12-081-3/+6
| | | | | | | | | | | | | | | _xxx_default_instance_ symbols are used in inline functions. We have to export them to avoid undefined reference link errors.
* | | Merge pull request #2461 from jbrianceau/add-missing-include-in-embed-ccFeng Xiao2016-12-081-0/+1
|\ \ \ | | | | | | | | Add missing include in embed.cc
| * | | Add missing include in embed.ccJulien Brianceau2016-12-081-0/+1
| |/ / | | | | | | | | | | | | This changes fixes "use of undeclared identifier 'assert'" compilation error.
* | | Make php generated code conform to PSR-4. (#2435)Paul Yang2016-12-081-169/+310
| | | | | | | | | | | | 1. Generate single file for each message. 2. Lazily initiate metadata.
* | | Improve ObjC deprecated annotation support.Thomas Van Lenten2016-12-085-6/+37
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | - 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.
* | Send all protobuf logging to logcat by default on AndroidAdam Cozzette2016-12-071-2/+11
| | | | | | | | | | | | | | | | | | | | | | 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 functionsJulien Brianceau2016-12-071-1/+1
|/ | | | | fixed_address_empty_string symbol is used in an inline function. We have to export it to avoid undefined reference link errors.
* Merge pull request #2437 from xfxyjwf/pluginFeng Xiao2016-12-0610-41/+1058
|\ | | | | Add version number to plugin protocol.
| * Add version number to plugin protocol.Feng Xiao2016-12-0510-41/+1058
| |
* | Merge pull request #2445 from ramrunner/masterFeng Xiao2016-12-051-1/+5
|\ \ | | | | | | OpenBSD correct endianess handling
| * | when on OpenBSD we include the correct headers for endianess and check the ↵ramrunner2016-12-051-1/+5
| | | | | | | | | | | | apropriate defines
* | | Factored Conformance and Benchmark test messages into shared test schema. ↵Joshua Haberman2016-12-031-0/+227
| |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (#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)Paul Yang2016-12-011-115/+268
| |
* | Add a swift_prefix file option.Thomas Van Lenten2016-11-303-143/+334
| | | | | | | | | | | | | | | | 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-fixAdam Cozzette2016-11-23218-12817/+13199
|\ \ | | | | | | Integrated internal changes from Google
| * | Add a "u" suffix to tag numbers in generated codeAdam Cozzette2016-11-2216-258/+258
| | | | | | | | | | | | | | | | | | 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.
| * | Add back missing LIBPROTOBUF_EXPORT.Feng Xiao2016-11-171-1/+1
| | |
| * | Merge branch 'master' into down-integrate-with-msvc-fixAdam Cozzette2016-11-1717-171/+278
| |\ \
| * | | Integrated internal changes from GoogleAdam Cozzette2016-11-17218-12630/+13000
| | | |
* | | | C++: Fix use with GOOGLE_PROTOBUF_NO_STATIC_INITIALIZERJulien Brianceau2016-11-211-1/+1
| |/ / |/| | | | | | | | | | | | | | | | | 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 LL to large constantzhsyourai2016-11-181-4/+4
| | | | | | | | | Some compiler will report: 'error: integer constant is too large for long type'
* | | Rename Empty to GPBEmpty in php generated file.Paul Yang2016-11-161-2/+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-ccAdam Cozzette2016-11-161-0/+1
|\ \ \ | | | | | | | | Add missing include in message_lite.cc
| * | | Add missing include in message_lite.ccJulien Brianceau2016-11-141-0/+1
| | | | | | | | | | | | | | | | | | | | This changes fixes "use of undeclared identifier 'INT_MAX'" compilation error.
* | | | Fix #include in js_generator.ccJulien Brianceau2016-11-141-1/+1
|/ / / | | | | | | | | | Reland commit f2885f6 that has been trampled by commit d64a2d99.
* | | Resolve old TODO for StringTypeHandler.Chris Kennelly2016-11-111-15/+1
| | | | | | | | | | | | | | | StringSpaceUsedExcludingSelf has been part of the lite library since b913cbd.
* | | Merge pull request #2353 from guptasu/masterFeng Xiao2016-11-113-10/+27
|\ \ \ | | | | | | | | MessageOptions should handle both proto2 and google.protobuf package names.
| * | | Made helper code also consider package name 'proto2' when dealing with ↵guptasu2016-11-103-10/+27
| | | | | | | | | | | | | | | | | | | | | | | | MessageOptions. This is done so that the same library can be used irrespective of whether MessageOptions belong to package name 'proto2' or 'google.protobuf'
* | | | Merge pull request #2337 from sergiocampama/deprecationFeng Xiao2016-11-103-115/+119
|\ \ \ \ | |/ / / |/| | | Fixes deprecation warnings/errors on Xcode
| * | | Fixing references to the removed atomicops_internals_pnacl.h file.Sergio Campama2016-11-101-111/+111
| | | |
| * | | Renamed the pnacl version of atomicops.h into C11 atomic, and flagged the ↵Sergio Campama2016-11-072-4/+8
| | | | | | | | | | | | | | | | mac version to that if atomic is enabled
* | | | Added explicit cast to avoid size warning on Win64.Rodrigo Hernandez2016-11-041-1/+1
|/ / /
* | | Fix unused parameter warnings in arena_freeAdam Cozzette2016-11-041-0/+1
| | | | | | | | | | | | | | | | | | 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.
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-08 08:15:29 +0000