aboutsummaryrefslogtreecommitdiff
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Fix warning in compiler/js/embed.ccJulien Brianceau2016-12-271-1/+1
| | | | | | | 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) { ^
* Merge pull request #2523 from jbrianceau/init-index-in-metadataAdam Cozzette2016-12-221-9/+12
|\ | | | | Init index_in_metadata_ without condition
| * Init index_in_metadata_ without conditionJulien Brianceau2016-12-211-9/+12
| | | | | | | | | | | | Chromium MemorySanitizer (MSan) reports use-of-uninitialized-value of index_in_metadata_ attribute from EnumGenerator class. Fix these warnings by initializing these attributes without condition.
* | simpler, cheaper callback to LazyStringOutputStreamCamillo Lugaresi2016-12-211-14/+2
| |
* | add MethodResultCallback_0_0Camillo Lugaresi2016-12-211-0/+30
|/
* Added well_known_types_embed.cc to CLEANFILES so that it gets cleaned upAdam Cozzette2016-12-201-1/+2
|
* Updated Makefile.am to fix out-of-tree buildsAdam Cozzette2016-12-201-1/+4
|
* Merge pull request #2506 from ckennelly/rvalue-settersAdam Cozzette2016-12-1913-1/+942
|\ | | | | Add rvalue setters for non-arena strings on C++11.
| * Add rvalue setters for non-arena strings on C++11.Chris Kennelly2016-12-1613-1/+942
| |
* | Merge pull request #2505 from ckennelly/masterAdam Cozzette2016-12-191-11/+4
|\ \ | | | | | | Remove spurious NULL checks in ArenaStringPtr::CreateInstance.
| * | Remove spurious NULL checks in ArenaStringPtr::CreateInstance.Chris Kennelly2016-12-151-11/+4
| |/
* | Auto-generate well_known_types_embed.ccAdam Cozzette2016-12-193-325/+20
| | | | | | | | | | | | | | Until now this file was just checked into the repo, but actually it should be generated from any.js, struct.js, and timestamp.js. This change updates the build system to make this happen. To make it work I also had to remove some C++11 features from embed.cc.
* | Merge pull request #2227 from KindDragon/3.1.xFeng Xiao2016-12-164-41/+43
|\ \ | |/ |/| Missed LIBPROTOC_EXPORT for GRPC added
| * LIBPROTOC_EXPORT added to others functions in csharp_names.h and ↵Arkadiy Shapkin2016-12-012-33/+33
| | | | | | | | objectivec_helpers.h
| * Missed LIBPROTOC_EXPORT for GRPC addedArkadiy Shapkin2016-12-014-8/+10
| |
* | Define LANG_CXX11 for port.h and use this to guard C++11 features.Chris Kennelly2016-12-142-2/+11
| |
* | Merge pull request #2495 from acozzette/android-hashAdam Cozzette2016-12-142-9/+3
|\ \ | | | | | | Removed Android-specific code from stubs/hash.h
| * | Removed Android-specific code from stubs/hash.hAdam Cozzette2016-12-132-9/+3
| | | | | | | | | | | | | | | | | | | | | This #ifdef in hash.h causes us to give up on finding a hash function on Android, when there do seem to be hash functions available in practice. I also had to tweak a macro in map.h that was disabling on Android an allocator construct() method that we need.
* | | 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