aboutsummaryrefslogtreecommitdiff
path: root/src/google
Commit message (Collapse)AuthorAgeFilesLines
* Revert "Fix js conformance tests. (#3604)" (#3633)Paul Yang2017-09-131-29/+5
| | | This reverts commit 2bd55a9fbcd2815b3332bf309bc20f59eef0b36b.
* Fix js conformance tests. (#3604)Paul Yang2017-09-121-5/+29
| | | | | | * Fix js conformance tests. * Remove old incorrect compatibility tests
* change the field number of php_generic_service to fix the conflict with (#3576)Paul Yang2017-08-303-137/+137
| | | internal descriptor.proto
* 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()
* 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 code free of missing-field-initializers warningsv3.4.0rc2Jisi Liu2017-08-0915-60/+62
|
* Merge branch 'master' into 3.4.xBo Yang2017-08-052-0/+2
|\
| * 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
| | |
* | | Fix invalid offsetof warning.Jisi Liu2017-08-0314-143/+314
| | | | | | | | | | | | 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.
* | | Merge remote-tracking branch 'origin/master' into mergeJisi Liu2017-07-252-2/+3
|\| |
| * | Merge pull request #3407 from bklarson/masterAdam Cozzette2017-07-2514-0/+28
| |\ \ | | | | | | | | 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.
| * | | Merge pull request #3281 from BSBandme/ConformanceTestYilunChongYilun Chong2017-07-242-3/+219
| |\ \ \ | | |_|/ | |/| | Proto2 test message support to conformance test
| | * | Merge branch 'master' into ConformanceTestYilunChongYilun Chong2017-06-3039-818/+967
| | |\ \
| | * | | add some test proto2 supported, add js proto2 supported, fixed some errorYilun Chong2017-06-302-4/+4
| | | | |
| | * | | change php objc nodejs csharp rubyYilun Chong2017-06-291-7/+7
| | | | |
| | * | | add message set test caseYilun Chong2017-06-281-0/+20
| | | | |
| | * | | add support for proto2Yilun Chong2017-06-261-4/+4
| | | | |
| | * | | add test_proto2_message.proto and change conformnace/makefile.amYilun Chong2017-06-231-0/+196
| | | | |
| * | | | Merge pull request #2969 from laszlocsomor/masterFeng Xiao2017-07-2413-81/+947
| |\ \ \ \ | | |_|_|/ | |/| | | Windows: support long paths in open/mkdir/access
| | * | | Windows: support long pathsLaszlo Csomor2017-07-1113-81/+947
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add implementations of open(2), mkdir(2), stat(2), etc. that support long paths under Windows (paths longer than MAX_PATH in <windows.h>, which is 260 characters). The implementations are in a separate namespace (google::protobuf::internal::win32), so they won't collide with the standard implementations in <io.h>, but after importing them with `using` they can be drop-in replacements. Fixes https://github.com/bazelbuild/bazel/issues/2634 Fixes https://github.com/google/protobuf/issues/2891
| * | | | Fixed dynamic initialization for C++ liteAdam Cozzette2017-07-1915-75/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | An ifdef condition seems to have been inverted by mistake, causing the dynamic initialization to occur for lite if and only if the _NO_STATIC_INITIALIZER macro is set. This problem manifested itself as segfaults due to uninitialized empty strings: https://github.com/google/protobuf/issues/2839 Since no one complained about initialization not happening, it would appear that we can just disable this initialization for lite unconditionally, so that is what this change does. Instead of the default instance initialization happening pre-main, it now always happens lazily when needed.
| * | | | Merge pull request #3375 from TeBoring/3.3.xPaul Yang2017-07-1933-20/+94
| |\ \ \ \ | | | | | | | | | | | | Merge 3.3.x into master
| | * \ \ \ Merge 3.3.x into masterBo Yang2017-07-1833-20/+94
| | |\ \ \ \
| | | * | | | Update C++ generated code.Bo Yang2017-06-2113-13/+13
| | | | | | |
| | | * | | | Update version number to 3.3.2Bo Yang2017-06-211-1/+1
| | | | | | |
| | | * | | | Add ARRAY for reserved name (#3150)Paul Yang2017-06-201-2/+2
| | | | | | |
| | | * | | | regenerate plugin and profile message codeSteven Peters2017-05-112-0/+4
| | | | | | |
| | | * | | | Use bool deterministic to suppress warningSteven Peters2017-05-1113-0/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #3059 by re-applying 08b1c718 from #3087.