aboutsummaryrefslogtreecommitdiff
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Set LIBPROTOBUF_EXPORT on GenericTypeHandler<class google::protobuf::Message>Nehal J Wani2018-08-151-3/+3
| | | | This should fix https://github.com/google/protobuf/issues/4717
* Set LIBPROTOBUF_EXPORT on GzipOutputStream::OptionsAdam Cozzette2018-08-151-1/+1
| | | | | | | This fixes issue #2610. This was originally fixed in a101fa52895fc2ad83d8b5d610243531b1608a08 , but got reverted by d36c0c538a545fac5d9db6ba65c525246d4efa95
* Updated version numbers to 3.6.1Adam Cozzette2018-07-2714-32/+32
|
* Remove js_embed binary. (#4709)Feng Xiao2018-07-163-130/+226
| | | | * Remove js_embed binary.
* Fix initialization with Visual StudioAdam Cozzette2018-07-0611-319/+132
| | | | | | | | | | | | It appears that Visual Studio does not work well with std::once_flag because it has a bug causing it to initialize that during dynamic initialization instead of constant initialization. This change works around the problem by using function static initializers instead. @gerben-s originally wrote this change for the Google-internal codebase but I am just cherry-picking it here. This fixes #4773.
* Work around MSVC issue with std::atomic initialization (#4777)Adam Cozzette2018-06-181-0/+9
| | | | | | | | | | | * Work around MSVC issue with std::atomic initialization MSVC seems to have a bug where it does not use constant initialization for std::atomic, which ends up causing crashes during initialization. This change introduces a workaround by putting the std::atomic inside a union, which causes the compiler to use constant initialization for it. * Added an AppVeyor test for static linking with MSVC
* Move methods out of class (#4697)Paul Yang2018-05-302-15/+26
|
* Add back GeneratedClassName to public (#4686)Paul Yang2018-05-301-0/+10
| | | These methods are used by grpc
* Fixed JS parsing of unspecified map keysAdam Cozzette2018-05-251-1/+5
| | | | | | | | | We need to use a default of 0 when parsing unspecified map keys, instead of failing an assertion. This change was written by Michael Aaron (michaelaaron@google.com) but I am cherry-picking it directly instead of waiting for the next sync of Google-internal changes.
* PHP namespaces for nested messages and enums (#4536)Brent Shaffer2018-05-252-145/+187
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * uses namespaces for nested messages and enums * fixes namespaces for PHP dist * fixes namespace for Descriptors, adds Cardinality and Kind * fixes nested namespaces for reserved words and adds tests * adds tests and generator fix for php class prefixes * fixes escaping of protobuf packages, enum comments, misc others * nice refactor of generated code * adds class files for backwards compatibility * simplifies code with templates * adds compatibility files to makefile * cleanup of generator and fixes nested namespace bug * regenerates proto types * remove internal BC classes * adds deprecated warning, adds methods back * simplifies if statement * fixes dist files * addresses review comments * adds back TYPE_URL_PREFIX constant * adds @deprecated to old nested class files * skips tests which require a separate process when protobuf.so is enabled * Adds tests for legacy nested classes that do not require separate processes to test * uses legacy names for GPBUtil message check * adds block for IDE @deprecated message * Namespace for nested message/enum in c extension * Remove unused code
* PHP array constructors for protobuf messages (#4530)Brent Shaffer2018-05-251-8/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP array constructors for protobuf messages * removes Descriptor from error message * allows mergeFrom to accept an array * only use initWithDescriptor if instanceof MapEntry * adds doc comments * removes ability for constructors to take arrays for submessages * Revert "allows mergeFrom to accept an array" This reverts commit b7b72182d561634af12c5c5c56a7cda3b33241f9. * makes mergeFromArray protected and fixes mergeFrom whitespace * Separates merging from JSON and merging from PHP array * removes well-known types and json keys from array construction * Addresses PR review comments * cleans up tests * fixes exception messages
* Adopt ruby_package in ruby generated code. (#4627)Paul Yang2018-05-251-3/+16
| | | | | | * Adopt ruby_package in ruby generated code. * Add test for ruby_package
* Adopt php_metadata_namespace in php code generator (#4622)Paul Yang2018-05-251-17/+37
| | | | | | | | | | | * Adopt php_metadata_namespace in php code generator The php_metadata_namespace is corresponded to the relative directory of the metadata file. e.g., previously, the metadata file of foo.proto was GPBMetadata/Foo.php. If the php_metadata_namespace is "Metadata\\Bar", the metadata file will be Metadata/Bar/Foo.php. * Handle empty php_metadata_namespace
* Make sure to delete temporary maps used by FileDescriptorTablesAdam Cozzette2018-05-241-8/+6
| | | | | | | I ran the tcmalloc heap checker in draconian mode, and it reported some heap allocations that were still reachable when protobuf-test exited. To fix that, I updated FileDescriptorTables to make sure its temporary heap-allocated maps are deleted when it is destroyed.
* Update version number to 3.6.0Jisi Liu2018-05-1414-32/+32
|
* Add file option php_metadata_namespace and ruby_package (#4609)Paul Yang2018-05-113-165/+535
|
* Fix error in Clang UndefinedBehaviorSanitizerPetter Strandmark2018-05-041-4/+6
| | | | | | Pointer Arguments to memcpy can not be null in UndefinedBehaviorSanitizer. In this case, both the memory and the size was zero. This change allows protoc to run under UndefinedBehaviorSanitizer.
* MinGW build failedIvan Shynkarenka2018-05-021-1/+1
|
* typoBrady Killeen2018-04-261-1/+1
|
* Write messages to backing field in generated C# cloning code (#4440)Sydney Acksman2018-04-191-1/+1
| | | | | | * Edited MessageFieldGenerator to clone to backing field instead of property * Generated C# proto code
* Merge pull request #4504 from xfxyjwf/liteFeng Xiao2018-04-181-0/+10
|\ | | | | Cleanup + documentation for Java Lite runtime.
| * Cleanup + documentation for Java Lite runtime.Feng Xiao2018-04-121-0/+10
| |
* | Fixed a Visual Studio 2017 build error. (#4488)Ronny Krüger2018-04-168-20/+13
|/ | | | | | | | | | | | | | | | The current 15.6.x versions of Visual Studio 2017 contain a bug that prevent them from compiling the following construct under certain conditions: std::unique_ptr<std::unique_ptr<Foo> []> foos; This will fail to compile if Foo is an abstract class. To work-around the problem the whole construct was change into: std::vector<std::unique_ptr<Foo>> foos; This not only fixes the compiler error but is also more readable than previous version.
* Merge pull request #4452 from xfxyjwf/docFeng Xiao2018-04-021-65/+71
|\ | | | | Update instructions about getting protobuf source.
| * Update instructions about getting protobuf source.Feng Xiao2018-03-291-65/+71
| |
* | Don't generate imports for the WKTs unless generating the WKTs.Thomas Van Lenten2018-04-024-8/+21
| | | | | | | | | | Since the generated header import GPBProtocolBuffers.h, there is no need to generate imports for the WKTs as they will have already been imported.
* | Trim imports for bundled generated protos.Thomas Van Lenten2018-04-022-12/+41
|/ | | | | | | | To avoid a cycle between headers, have the WKTs use minimal imports instead of using the helper to get everything from the library. Fixes https://github.com/google/protobuf/issues/4301 Fixes https://github.com/google/protobuf/issues/4403
* Removed atomicops.h since it is no longer usedAdam Cozzette2018-03-271-237/+0
|
* Include googletest as a submodule (#3993)Carlos O'Ryan2018-03-262-24/+28
| | | Add googletest as a submodule in third_party/googletest.
* source code info for interpreted options; fix source code info for extension ↵Joshua Humphries2018-03-264-68/+748
| | | | | | | | | range options (#4342) * when interpreting options, rewrite file descriptor's source code info - so that interpreted option paths have correct location information - so that corresponding uninterpreted option paths are removed also includes a fix to source code locations for extension range options
* Merge pull request #4431 from xfxyjwf/rmnanoFeng Xiao2018-03-2625-5831/+0
|\ | | | | Remove javanano.
| * Remove javanano.Feng Xiao2018-03-2625-5831/+0
| |
* | Fixes MSVC compiler warning C4800 "Forcing value to bool 'true' or 'false'" ↵Alexey Malov2018-03-262-2/+2
| | | | | | | | (#4350)
* | Merge pull request #4395 from stone4774/fixbug_enum2json2Feng Xiao2018-03-265-17/+66
|\ \ | | | | | | Fix bug: whether always_print_enums_as_ints is true or false, it alwa…
| * \ Merge branch 'master' into fixbug_enum2json2stone47742018-03-22236-12902/+13232
| |\ \
| * | | Use the first enum value instead of 0 in ↵stone47742018-03-211-1/+1
| | | | | | | | | | | | | | | | DefaultValueObjectWriter::FindEnumDefault
| * | | Fix bug: whether always_print_enums_as_ints is true or false, it always ↵stone47742018-03-195-17/+66
| | | | | | | | | | | | | | | | print the default value of enums as strings
* | | | Fix missing LIBPROTOC_EXPORT.Egor Pugin2018-03-251-3/+6
| |_|/ |/| | | | | This makes possible to build grpc_php_plugin with protobuf in shared mode.
* | | Removed some unused C++ source filesAdam Cozzette2018-03-2221-4899/+0
| |/ |/|
* | Merge pull request #4387 from acozzette/down-integrateAdam Cozzette2018-03-20235-12894/+13221
|\ \ | | | | | | Integrated internal changes from Google
| * | Added new test source files to Makefile.amAdam Cozzette2018-03-201-0/+4
| | |
| * | Removed use of some type traitsAdam Cozzette2018-03-203-5/+5
| | | | | | | | | | | | | | | Pre-5.1.0 versions of GCC do not support these particular type traits (see https://github.com/google/protobuf/issues/417).
| * | Deleted scoped_ptr.hAdam Cozzette2018-03-1424-306/+47
| | | | | | | | | | | | | | | We no longer need this, now that we have finished the switch to C++11 and are using std::unique_ptr.
| * | Fixed up proto3_lite_unittest.ccAdam Cozzette2018-03-141-11/+11
| | |
| * | Merge branch 'master' into down-integrateAdam Cozzette2018-03-139-12/+77
| |\ \
| * | | Integrated internal changes from GoogleAdam Cozzette2018-03-13213-12611/+13193
| | | |
* | | | Merge pull request #4371 from Rasrack/gnuc_minorAdam Cozzette2018-03-151-1/+1
|\ \ \ \ | | | | | | | | | | Fix spelling error of __GNUC_MINOR__
| * | | | Fix spelling error of __GNUC_MINOR__Adam Aili2018-03-101-1/+1
| | |/ / | |/| |
* | | | Merge pull request #4310 from KindDragon/patch-1Feng Xiao2018-03-141-6/+9
|\ \ \ \ | |/ / / |/| | | Support using MSVC intrinsics in Log2FloorNonZero
| * | | Support using MSVC intrinsics in Log2FloorNonZeroArkady Shapkin2018-02-151-6/+9
| |/ /