aboutsummaryrefslogtreecommitdiff
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
...
* | | Merge pull request #3548 from google/3.4.xJisi Liu2017-08-223-54/+17
|\ \ \ | | |/ | |/| Merge fixes from 3.4.x into master
| * | Disable death tests on windowsJisi Liu2017-08-222-39/+2
| | | | | | | | | | | | Also remove cord related code
| * | Merge pull request #3539 from drivehappy/3.4.x_clang_cleanup_1Jisi Liu2017-08-222-29/+33
| |\ \ | | | | | | | | Merge pull request #3535 from drivehappy/clang_warn_cleanup
| | * | Merge pull request #3535 from drivehappy/clang_warn_cleanupJisi Liu2017-08-212-29/+33
| | | | | | | | | | | | Fixing unused parameter warnings under Clang.
| * | | Merge pull request #3494 from drivehappy/clang_warning_macroJisi Liu2017-08-211-2/+5
| |/ / | | | | | | Fixing -Wexpansion-to-defined Clang warning
| * | Fix compile errorsJisi Liu2017-08-211-3/+3
| | |
| * | Remove C++11 features in io_win32.ccJisi Liu2017-08-211-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_cleanupJisi Liu2017-08-212-29/+33
|\ \ \ | | | | | | | | Fixing unused parameter warnings under Clang.
| * | | Fixing unused parameter warnings under Clang.drivehappy2017-08-212-29/+33
| | |/ | |/|
* | | Merge remote-tracking branch 'origin/3.4.x' into mergemasterJisi Liu2017-08-18179-7262/+12264
|\ \ \ | |/ / |/| / | |/
| * Fix cmath/math.h include with non C++11 libstdc++Jisi Liu2017-08-151-6/+11
| |
| * Merge pull request #3485 from pherl/mingwv3.4.0rc3Jisi Liu2017-08-1113-15/+44
| |\ | | | | | | Fix build on MinGW32
| | * Fix commentsJisi Liu2017-08-112-1/+2
| | |
| | * Add malloc castJisi Liu2017-08-111-2/+2
| | |
| | * implement remove strdup usage and implement our ownJisi Liu2017-08-111-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 strdupJisi Liu2017-08-111-0/+1
| | |
| | * Fix mkdirJisi Liu2017-08-111-2/+6
| | |
| | * Make win32_io only for MSVCJisi Liu2017-08-1112-12/+22
| | | | | | | | | | | | | | | This excludes cygwin and mingw from using the self implemented functions.
| | * Fix the declaration order in ming32Jisi Liu2017-08-111-5/+5
| | |
| | * Fixing io_win32 for MinGW32Jisi Liu2017-08-111-0/+3
| | |
| * | Make compilers without ref-qualifier support happy.Jisi Liu2017-08-111-2/+4
| |/
| * Make no warning test stricter.Jisi Liu2017-08-101-12/+7
| | | | | | | | | | - Now it includes -Wextra except for unused-parameter. - Removed gtest dependency
| * Make code free of missing-field-initializers warningsv3.4.0rc2Jisi Liu2017-08-0916-61/+64
| |
| * Merge branch 'master' into 3.4.xBo Yang2017-08-052-0/+2
| |\
| * | Fix invalid offsetof warning.Jisi Liu2017-08-0315-144/+315
| | | | | | | | | | | | Use composition instead of inheritance for oneof default.
| * | Add destructors for default instances to the shutdown code.Gerben Stavenga2017-08-0216-73/+152
| | | | | | | | | | | | Verified test succeed under draconian heap checker
| * | Adding the missing headerJisi Liu2017-08-011-0/+1
| | |
| * | Export functions in io_win32.h in win DLL buildJisi Liu2017-08-011-13/+14
| | | | | | | | | | | | | | | Previous code duplicates io_win32.cc in sources of all the libraries that include io_win32.h header.
| * | Fix makefile.amJisi Liu2017-07-251-0/+3
| | |
| * | Fix build filesJisi Liu2017-07-251-0/+3
| | |
| * | Merge remote-tracking branch 'origin/master' into mergeJisi Liu2017-07-252-2/+3
| |\ \
| * | | Merge from masterJisi Liu2017-07-2533-89/+1276
| | | |
| * | | Merge remote-tracking branch 'origin/3.4.x' into vbJisi Liu2017-07-241-22/+32
| |\ \ \
| | * | | Omit the zip test if tools are not availableJisi Liu2017-07-241-22/+32
| | | | |
| * | | | Update required version on pre-generated filesJisi Liu2017-07-2412-12/+12
| | | | |
| * | | | Update pre generated filesJisi Liu2017-07-2412-12/+12
| | | | |
| * | | | Update version number for 3.4.0Jisi Liu2017-07-242-8/+8
| |/ / /
| * | | Fix distcheckJisi Liu2017-07-191-0/+1
| | | |
| * | | remove profileJisi Liu2017-07-193-2238/+0
| | | |
| * | | Merge master into 3.4.xJisi Liu2017-07-1884-1014/+1728
| |\ \ \
| * | | | Merge from Google internal for 3.4 releaseJisi Liu2017-07-18169-4951/+11729
| | | | |
* | | | | Fixing warning under Clang 6.x (-Wexpansion-to-defined) where the macro ↵drivehappy2017-08-151-2/+5
| | | | | | | | | | | | | | | | | | | | expansion producing 'defined' was warning on undefined behavior.
* | | | | Clean up typedefs for Atomic32/Atomic64Brad Larson2017-08-101-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 Lenten2017-07-261-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/1745Adam Cozzette2017-07-251-0/+1
|\ \ \ \ | |_|_|/ |/| | | Fix issue #1745 - javascript allow dot in filename
| * | | Fix quotation marksAdam2017-07-241-1/+1
| | | |
| * | | Fix issue #1745 - javascript allow dot in filenameAdam2017-07-241-0/+1
| | | |
* | | | Merge pull request #3407 from bklarson/masterAdam Cozzette2017-07-2515-1/+29
|\ \ \ \ | | | | | | | | | | Add declaration for AddDescriptorsImpl()
| * | | | Put AddDescriptorsImpl() in anonymous namespaceBrad Larson2017-07-2414-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.
| * | | | Add -Werror=missing-declarations to test buildsBrad Larson2017-07-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Treat missing declarations as an error for test builds, to prevent future updates which add functions without properly declaring them. This will prevent broken builds in more restrictive build environments.