aboutsummaryrefslogtreecommitdiff
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'google/master' into integration_baseintegration_baseFeng Xiao2018-08-091-1/+1
|\
| * Fix broken test of const repeated field iteratorsBrian Silverman2018-08-081-1/+1
| | | | | | | | | | | | The old version had a NOP for loop, which doesn't make sense. I'm pretty sure this was the original intention. Newer GCC's -Wunused-but-set-variable flags the old version.
* | Merge master branch.Feng Xiao2018-08-0838-169/+169
|\|
| * 4593 Replace all occurrences of "NULL" to nullptr in src/google/protobug/stubsDhruv2018-08-0723-148/+148
| |
| * Merge branch '3.6.x' into merge-3-6-xAdam Cozzette2018-08-0114-32/+32
| |\
| | * 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.
| * | Remove/replace travis references (#4953)Feng Xiao2018-07-221-1/+1
| | | | | | | | | | | | * Remove/replace travis references.
* | | Down-integrate from google3.Feng Xiao2018-08-08318-15613/+24500
|/ /
* | When running unit tests, read reference files in text modeStephen Oberholtzer2018-07-197-10/+15
| | | | | | | | | | This should put an end to all of the reports of unit test failures on Windows machines.
* | Delete unused files. (#4942)Feng Xiao2018-07-198-2083/+0
| | | | | | * Delete unused files.
* | Add cpp tests under release docker image.Feng Xiao2018-07-151-6/+6
| | | | | | | | | | | | 1. Added C++ tests under the release docker image. 2. Fixed a compile issue with the docker image. 3. Cleaned up tests.sh and removed traivis stuff.
* | fix commonjs js provide GOOGLE_CHECKYilun Chong2018-07-121-1/+1
| |
* | OnShutdownDelete shadowing issueIvan Shynkarenka2018-07-101-1/+1
| | | | | | | | https://github.com/google/protobuf/issues/4887
* | Merge pull request #4882 from google/3.6.xAdam Cozzette2018-07-0911-319/+132
|\| | | | | Merge 3.6.x into master
| * 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.
* | Fix SFINAE in 'RepeatedPtrFieldBase::Add'M. Tong2018-07-061-2/+2
| | | | | | | | | | Without this the error of un-moveable GenericTypeHandler will pop until 'TypeHandler::New(arena_, std::move(value))' is called.
* | Merge pull request #4299 from hekike/feat/add-commonjs-strict-import-styleJoshua Haberman2018-07-022-10/+36
|\ \ | | | | | | Feat: add import-style=commonjs_strict option to the compiler
| * | fix(js_generator): check for protoPeter Marton2018-05-211-0/+1
| | |
| * | Fix strict JS generator with import in a protofilePeter Marton2018-05-081-3/+6
| | |
| * | Feat: add import-style=commonjs_strict option to the compilerPeter Marton2018-05-082-10/+32
| | |
* | | Set LIBPROTOBUF_EXPORT on GenericTypeHandler<class google::protobuf::Message>Nehal J Wani2018-07-011-3/+3
| | | | | | | | | | | | This should fix https://github.com/google/protobuf/issues/4717
* | | Set LIBPROTOBUF_EXPORT on GzipOutputStream::OptionsAdam Cozzette2018-07-011-1/+1
| | | | | | | | | | | | | | | | | | | | | This fixes issue #2610. This was originally fixed in a101fa52895fc2ad83d8b5d610243531b1608a08 , but got reverted by d36c0c538a545fac5d9db6ba65c525246d4efa95
* | | Fix to allow a compilation under mips big endian with gccCharles Hardin2018-06-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The __MIPSEL__ is mips little endian, specific and we needed to compile for a big endian mips target that also happened to be a mips64, so replaced the __MIPSEL__ with a __mip__ which should preserve the build on little endian and allow a build for a big endian setup. $ echo | mips64-linux-gcc -E -dM - ... snip snip ... #define __mips__ 1 #define __MIPSEB__ 1 Signed-off-by: Charles Hardin <ckhardin@gmail.com>
* | | Add -Og to no-warning-test (#4830)Paul Yang2018-06-2811-37/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add -Og to no-warning-test * Initialize value * Implement PrintFieldName in CompactRepeatedFieldPrinter to prevent Woverloaded-virtual * Update generated code
* | | Removed forward declaration of MemBlock classMichal Matuszak2018-06-251-1/+0
| | | | | | | | | | | | | | | Removed forward declaration of MemBlock class. Declaration is in conflict with declaration `::strings::MemBlock`
* | | Merge pull request #4827 from acozzette/merge-3-6-xAdam Cozzette2018-06-2517-41/+52
|\ \ \ | | | | | | | | Merge 3.6.x branch into master
| * \ \ Merge branch '3.6.x' into merge-3-6-xAdam Cozzette2018-06-2517-41/+52
| |\ \ \ | | | |/ | | |/|
| | * | 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
| | | |
* | | | Merge pull request #4824 from sschuberth/remove-exec-bitFeng Xiao2018-06-257-0/+0
|\ \ \ \ | | | | | | | | | | Remove the executable bit from several source code files
| * | | | Remove the executable bit from several source code filesSebastian Schuberth2018-06-257-0/+0
| |/ / / | | | | | | | | | | | | This potentially avoids compiler warnings.
* | | | Merge pull request #4608 from khuzemap/masterFeng Xiao2018-06-2536-448/+473
|\ \ \ \ | | | | | | | | | | Add "override" keyword for overridden virtual functions
| * | | | Add "override" for overridden virtual functionsKhuzema Pithewan2018-06-1936-449/+474
| | |_|/ | |/| | | | | | | | | | | | | | | | | | Add "override" for overridden virtual functions. Please refer following issue for discussion on this. https://github.com/google/protobuf/issues/67
* | | | Merge pull request #4172 from OskarKinomoto/masterAdam Cozzette2018-06-251-0/+8
|\ \ \ \ | |_|/ / |/| | | Add guards against bswap_XX redefnitions
| * | | Add guards against bswap_XX redefnitionsOskar Świtalski2018-01-151-0/+8
| | | | | | | | | | | | | | | | Signed-off-by: Oskar Świtalski <oskar.switalski@indoorway.com>
* | | | Fix parameters declarationvervaekejonathan2018-06-221-2/+2
| | | |
* | | | Merge pull request #4813 from htuch/fix-any-in-mapFeng Xiao2018-06-214-2/+21
|\ \ \ \ | | | | | | | | | | protostream_objectwriter: fix bug when Any is directly embedded in a …
| * | | | protostream_objectwriter: fix bug when Any is directly embedded in a map.Harvey Tuch2018-06-214-2/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This came up when trying to round-trip the JSON<->proto3 conversion for Envoy's envoy.admin.v2alpha.ConfigDump (https://github.com/envoyproxy/envoy/blob/b903c1dc984593f8e95e0569c1503dc5d85fbe34/api/envoy/admin/v2alpha/config_dump.proto#L29). Validated fix on the Envoy code base and via the provided unit test. Signed-off-by: Harvey Tuch <htuch@google.com>
* | | | | Merge pull request #4812 from htuch/fix-any-caseFeng Xiao2018-06-213-0/+88
|\ \ \ \ \ | | | | | | | | | | | | protostream_objectsource: preserve print options across Any.
| * | | | | Added TODO for grouping options.Harvey Tuch2018-06-211-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Harvey Tuch <htuch@google.com>
| * | | | | protostream_objectsource: preserve print options across Any.Harvey Tuch2018-06-213-0/+85
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #4771. Based on the solution included in the issues from @wangjinhua. Validated this works with Envoy's /config_dump JSON rendering. Signed-off-by: Harvey Tuch <htuch@google.com>
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-13 21:45:48 +0000