aboutsummaryrefslogtreecommitdiff
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #5105 from sigurdm/invoke_plugin_via_cmdFeng Xiao2018-09-101-4/+5
|\ | | | | On Windows invoke plugins using cmd.exe
| * On Windows invoke plugins using cmd.exeSigurd Meldgaard2018-09-031-4/+5
| | | | | | | | | | | | | | | | This will find .bat files as well as .exe. Only affects the case when plugins are invoked from PATH. This does not change behaviour when compiled under Cygwin..
* | Merge pull request #5109 from haberman/integrateJoshua Haberman2018-09-07215-4812/+6048
|\ \ | |/ |/| Down-integrate from google3.
| * Down-integrate from google3.Josh Haberman2018-09-04215-4812/+6048
| |
* | Also make sure known fields come across as expectedBrandon Cole2018-08-301-1/+6
| |
* | Code fixes for the original unit test.Brandon Cole2018-08-302-1/+18
| | | | | | | | Credit goes to @mercret for the fix.
* | Add unit test for loading unknown fields in Any messagesBrandon Cole2018-08-301-0/+18
|/ | | | Use ./tests.sh cpp to run it
* Replace repo links.Feng Xiao2018-08-2210-14/+14
|
* Merge pull request #5024 from greenhouse-org/fix-windows-pathFeng Xiao2018-08-201-1/+2
|\ | | | | Fix TryCreateParentDirectory on Windows
| * Always spilt on '\' and '/'Sam Smith2018-08-131-5/+1
| |
| * Fix TryCreateParentDirectory on WindowsSam Smith2018-08-091-0/+5
| | | | | | | | | | | | | | On Windows, both '/' and '\' are valid path separators. So when creating the parent directories, split the filename on both Signed-off-by: Akshat Gokhale <agokhale@pivotal.io>
* | Document wrapper non-usesJoe Tsai2018-08-131-0/+5
| | | | | | | | Document the cases where the wrapper well-known types are not useful.
* | Merge pull request #5033 from xfxyjwf/upFeng Xiao2018-08-131-1/+1
|\ \ | | | | | | Fix issues discovered in up-integration.
| * | Fix issues discovered in up-integration.Feng Xiao2018-08-131-1/+1
| | |
* | | Add status badge for bazel build.Feng Xiao2018-08-131-1/+1
|/ /
* | Down-integrate proto2 namespace fix.Feng Xiao2018-08-1336-116/+117
| |
* | Fix failing tests.Feng Xiao2018-08-095-5/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Fix C++ tests. * Add missing files to Makefile.am and fix distcheck in tests.sh * Remove BUILT_SOURCES from conformance/Makefile.am. * Add some missing override keyword. * Add a type cast to int64 because our StrCat() in stubs can't handle size_t. 2. Fix Java tests. * Add missing test dependency on guava in pom.xml. * Include newly referenced test data in test resources. * Manually fix map_lite_test.proto which is overwritten because it's mapped from map_test.proto in google3. * Add back "optimize_for = LITE_RUNTIME" which is still needed to keep the opensource test passing as it's still running lite tests. * Add a type cast in newBuilder() because without it the code doesn't compile with openjdk javac 1.8 (the compiler can't figure if it's the right type due to complex generic typing). 3. Fix Python tests. * Remove/replace references to <hash_map>. * Suppress more warnings in setup.py. * Replace incorrect header inclusion for google/protobuf/proto_api.h. * Add strings::EndsWith to google/protobuf/stubs/strutil.h because it's referenced in the updated python C extension code. * Replace proto2 with google::protobuf. The proto2 name is leaked to opensource because we removed the subsitition rule for proto2 namespace but only fixed C++ source code and forgot to update python C extension code.
* | 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
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-28 23:14:04 +0000