Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | Exclude addressbook.proto from C# boostrap test. | Feng Xiao | 2017-09-11 | 1 | -5/+0 | |
| | | | | | | | | | | This addressbook.proto now belongs to its own bazel pacakge and can't be accessed in bazel protobuf_test target. | |||||
* | | Merge pull request #3503 from gburgessiv/master | Jisi Liu | 2017-08-24 | 1 | -1/+4 | |
|\ \ | | | | | | | Work around a bug in clang's static analyzer | |||||
| * | | Work around a bug in clang's static analyzer | George Burgess IV | 2017-08-22 | 1 | -1/+4 | |
| | | | | | | | | | | | | | | | | | | | | | Due to https://bugs.llvm.org/show_bug.cgi?id=34198, clang's static analyzer emits diagnostics about leaking `container`. Doing this assignment in two steps works around this, and shouldn't cause these issues. | |||||
* | | | Merge pull request #3548 from google/3.4.x | Jisi Liu | 2017-08-22 | 3 | -54/+17 | |
|\ \ \ | | |/ | |/| | Merge fixes from 3.4.x into master | |||||
| * | | Disable death tests on windows | Jisi Liu | 2017-08-22 | 2 | -39/+2 | |
| | | | | | | | | | | | | Also remove cord related code | |||||
| * | | Merge pull request #3539 from drivehappy/3.4.x_clang_cleanup_1 | Jisi Liu | 2017-08-22 | 2 | -29/+33 | |
| |\ \ | | | | | | | | | Merge pull request #3535 from drivehappy/clang_warn_cleanup | |||||
| | * | | Merge pull request #3535 from drivehappy/clang_warn_cleanup | Jisi Liu | 2017-08-21 | 2 | -29/+33 | |
| | | | | | | | | | | | | Fixing unused parameter warnings under Clang. | |||||
| * | | | Merge pull request #3494 from drivehappy/clang_warning_macro | Jisi Liu | 2017-08-21 | 1 | -2/+5 | |
| |/ / | | | | | | | Fixing -Wexpansion-to-defined Clang warning | |||||
| * | | Fix compile errors | Jisi Liu | 2017-08-21 | 1 | -3/+3 | |
| | | | ||||||
| * | | Remove C++11 features in io_win32.cc | Jisi Liu | 2017-08-21 | 1 | -15/+15 | |
| | | | | | | | | | | | | | | | - Use scoped_array instead of unique_ptr. - Do not use string::front() and string::back() | |||||
* | | | Merge pull request #3535 from drivehappy/clang_warn_cleanup | Jisi Liu | 2017-08-21 | 2 | -29/+33 | |
|\ \ \ | | | | | | | | | Fixing unused parameter warnings under Clang. | |||||
| * | | | Fixing unused parameter warnings under Clang. | drivehappy | 2017-08-21 | 2 | -29/+33 | |
| | |/ | |/| | ||||||
* | | | Merge remote-tracking branch 'origin/3.4.x' into mergemaster | Jisi Liu | 2017-08-18 | 178 | -7242/+12246 | |
|\ \ \ | |/ / |/| / | |/ | ||||||
| * | Fix cmath/math.h include with non C++11 libstdc++ | Jisi Liu | 2017-08-15 | 1 | -6/+11 | |
| | | ||||||
| * | Merge pull request #3485 from pherl/mingwv3.4.0rc3 | Jisi Liu | 2017-08-11 | 13 | -15/+44 | |
| |\ | | | | | | | Fix build on MinGW32 | |||||
| | * | Fix comments | Jisi Liu | 2017-08-11 | 2 | -1/+2 | |
| | | | ||||||
| | * | Add malloc cast | Jisi Liu | 2017-08-11 | 1 | -2/+2 | |
| | | | ||||||
| | * | implement remove strdup usage and implement our own | Jisi Liu | 2017-08-11 | 1 | -2/+12 | |
| | | | | | | | | | | | | | | | strdup is not part C or C++ standard but POXIS function. Several compilers failed to compile strdup or generate warnings. | |||||
| | * | Adding missing imports for strdup | Jisi Liu | 2017-08-11 | 1 | -0/+1 | |
| | | | ||||||
| | * | Fix mkdir | Jisi Liu | 2017-08-11 | 1 | -2/+6 | |
| | | | ||||||
| | * | Make win32_io only for MSVC | Jisi Liu | 2017-08-11 | 12 | -12/+22 | |
| | | | | | | | | | | | | | | | This excludes cygwin and mingw from using the self implemented functions. | |||||
| | * | Fix the declaration order in ming32 | Jisi Liu | 2017-08-11 | 1 | -5/+5 | |
| | | | ||||||
| | * | Fixing io_win32 for MinGW32 | Jisi Liu | 2017-08-11 | 1 | -0/+3 | |
| | | | ||||||
| * | | Make compilers without ref-qualifier support happy. | Jisi Liu | 2017-08-11 | 1 | -2/+4 | |
| |/ | ||||||
| * | Make code free of missing-field-initializers warningsv3.4.0rc2 | Jisi Liu | 2017-08-09 | 15 | -60/+62 | |
| | | ||||||
| * | Merge branch 'master' into 3.4.x | Bo Yang | 2017-08-05 | 2 | -0/+2 | |
| |\ | ||||||
| * | | Fix invalid offsetof warning. | Jisi Liu | 2017-08-03 | 14 | -143/+314 | |
| | | | | | | | | | | | | Use composition instead of inheritance for oneof default. | |||||
| * | | Add destructors for default instances to the shutdown code. | Gerben Stavenga | 2017-08-02 | 16 | -73/+152 | |
| | | | | | | | | | | | | Verified test succeed under draconian heap checker | |||||
| * | | Adding the missing header | Jisi Liu | 2017-08-01 | 1 | -0/+1 | |
| | | | ||||||
| * | | Export functions in io_win32.h in win DLL build | Jisi Liu | 2017-08-01 | 1 | -13/+14 | |
| | | | | | | | | | | | | | | | Previous code duplicates io_win32.cc in sources of all the libraries that include io_win32.h header. | |||||
| * | | Merge remote-tracking branch 'origin/master' into merge | Jisi Liu | 2017-07-25 | 2 | -2/+3 | |
| |\ \ | ||||||
| * | | | Merge from master | Jisi Liu | 2017-07-25 | 32 | -88/+1274 | |
| | | | | ||||||
| * | | | Merge remote-tracking branch 'origin/3.4.x' into vb | Jisi Liu | 2017-07-24 | 1 | -22/+32 | |
| |\ \ \ | ||||||
| | * | | | Omit the zip test if tools are not available | Jisi Liu | 2017-07-24 | 1 | -22/+32 | |
| | | | | | ||||||
| * | | | | Update required version on pre-generated files | Jisi Liu | 2017-07-24 | 12 | -12/+12 | |
| | | | | | ||||||
| * | | | | Update pre generated files | Jisi Liu | 2017-07-24 | 12 | -12/+12 | |
| | | | | | ||||||
| * | | | | Update version number for 3.4.0 | Jisi Liu | 2017-07-24 | 1 | -5/+5 | |
| |/ / / | ||||||
| * | | | remove profile | Jisi Liu | 2017-07-19 | 3 | -2238/+0 | |
| | | | | ||||||
| * | | | Merge master into 3.4.x | Jisi Liu | 2017-07-18 | 84 | -1014/+1728 | |
| |\ \ \ | ||||||
| * | | | | Merge from Google internal for 3.4 release | Jisi Liu | 2017-07-18 | 168 | -4944/+11724 | |
| | | | | | ||||||
* | | | | | Fixing warning under Clang 6.x (-Wexpansion-to-defined) where the macro ↵ | drivehappy | 2017-08-15 | 1 | -2/+5 | |
| | | | | | | | | | | | | | | | | | | | | expansion producing 'defined' was warning on undefined behavior. | |||||
* | | | | | Clean up typedefs for Atomic32/Atomic64 | Brad Larson | 2017-08-10 | 1 | -21/+14 | |
| |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The typedefs for Atomic32 and Atomic64 were sometimes causing Atomic32 to be an int32 rather than an intptr_t on 32-bit platforms. On some of these platforms (ARM/CortexM building with GCC 6 in one case) int32 is a long int, while intptr_t is an int, which causes a compiler error even though long int and int are both 4 bytes. Having Atomic32 always be intptr_t on 32-bit platforms and Atomic64 always be intptr_t on 64-bit platforms should resolve any of these types of errors. | |||||
* | | | | Add a objc_class_prefix to test_messages_proto3.proto. | Thomas Van Lenten | 2017-07-26 | 1 | -0/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Both test_messages_proto3.proto & test_messages_proto2.proto define message ForeignMessage {...} and enum ForeignEnum {...} but since objc doesn't use the proto package in the naming, these end up conflicting. Adding the objc_class_prefix option to the proto3 file ensure the generated objc types are all unique. | |||||
* | | | | Merge pull request #3410 from adam-26/1745 | Adam Cozzette | 2017-07-25 | 1 | -0/+1 | |
|\ \ \ \ | |_|_|/ |/| | | | Fix issue #1745 - javascript allow dot in filename | |||||
| * | | | Fix quotation marks | Adam | 2017-07-24 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | Fix issue #1745 - javascript allow dot in filename | Adam | 2017-07-24 | 1 | -0/+1 | |
| | | | | ||||||
* | | | | Merge pull request #3407 from bklarson/master | Adam Cozzette | 2017-07-25 | 14 | -0/+28 | |
|\ \ \ \ | | | | | | | | | | | Add declaration for AddDescriptorsImpl() | |||||
| * | | | | Put AddDescriptorsImpl() in anonymous namespace | Brad Larson | 2017-07-24 | 14 | -0/+28 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AddDescriptorsImpl() is a private static implementation detail, and needs to be declared but won't be used from outside the source file. Place it inside an anonymous namespace to fix a previous build error that would result in more restrictive build enviornments that use -Werror=missing-declarations or similar compiler flags. | |||||
* | | | | | Merge pull request #3281 from BSBandme/ConformanceTestYilunChong | Yilun Chong | 2017-07-24 | 2 | -3/+219 | |
|\ \ \ \ \ | |_|/ / / |/| | | | | Proto2 test message support to conformance test | |||||
| * | | | | Merge branch 'master' into ConformanceTestYilunChong | Yilun Chong | 2017-06-30 | 39 | -818/+967 | |
| |\ \ \ \ |