aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/google
Commit message (Collapse)AuthorAge
* Revert "Fix js conformance tests. (#3604)" (#3633)Gravatar Paul Yang2017-09-13
| | | This reverts commit 2bd55a9fbcd2815b3332bf309bc20f59eef0b36b.
* Fix js conformance tests. (#3604)Gravatar Paul Yang2017-09-12
| | | | | | * Fix js conformance tests. * Remove old incorrect compatibility tests
* change the field number of php_generic_service to fix the conflict with (#3576)Gravatar Paul Yang2017-08-30
| | | internal descriptor.proto
* Disable death tests on windowsGravatar Jisi Liu2017-08-22
| | | | Also remove cord related code
* Merge pull request #3539 from drivehappy/3.4.x_clang_cleanup_1Gravatar Jisi Liu2017-08-22
|\ | | | | Merge pull request #3535 from drivehappy/clang_warn_cleanup
* | Merge pull request #3494 from drivehappy/clang_warning_macroGravatar Jisi Liu2017-08-21
| | | | | | Fixing -Wexpansion-to-defined Clang warning
| * Merge pull request #3535 from drivehappy/clang_warn_cleanupGravatar Jisi Liu2017-08-21
|/ | | Fixing unused parameter warnings under Clang.
* Fix compile errorsGravatar Jisi Liu2017-08-21
|
* Remove C++11 features in io_win32.ccGravatar Jisi Liu2017-08-21
| | | | | - 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++Gravatar Jisi Liu2017-08-15
|
* Merge pull request #3485 from pherl/mingwGravatar Jisi Liu2017-08-11
|\ | | | | Fix build on MinGW32
| * Fix commentsGravatar Jisi Liu2017-08-11
| |
* | Make compilers without ref-qualifier support happy.Gravatar Jisi Liu2017-08-11
| |
| * Add malloc castGravatar Jisi Liu2017-08-11
| |
| * implement remove strdup usage and implement our ownGravatar Jisi Liu2017-08-11
| | | | | | | | | | strdup is not part C or C++ standard but POXIS function. Several compilers failed to compile strdup or generate warnings.
| * Adding missing imports for strdupGravatar Jisi Liu2017-08-11
| |
| * Fix mkdirGravatar Jisi Liu2017-08-11
| |
| * Make win32_io only for MSVCGravatar Jisi Liu2017-08-11
| | | | | | | | | | This excludes cygwin and mingw from using the self implemented functions.
| * Fix the declaration order in ming32Gravatar Jisi Liu2017-08-11
| |
| * Fixing io_win32 for MinGW32Gravatar Jisi Liu2017-08-11
|/
* Make code free of missing-field-initializers warningsGravatar Jisi Liu2017-08-09
|
* Merge branch 'master' into 3.4.xGravatar Bo Yang2017-08-05
|\
* | Fix invalid offsetof warning.Gravatar Jisi Liu2017-08-03
| | | | | | | | Use composition instead of inheritance for oneof default.
* | Add destructors for default instances to the shutdown code.Gravatar Gerben Stavenga2017-08-02
| | | | | | | | Verified test succeed under draconian heap checker
* | Adding the missing headerGravatar Jisi Liu2017-08-01
| |
* | Export functions in io_win32.h in win DLL buildGravatar Jisi Liu2017-08-01
| | | | | | | | | | Previous code duplicates io_win32.cc in sources of all the libraries that include io_win32.h header.
| * Add a objc_class_prefix to test_messages_proto3.proto.Gravatar Thomas Van Lenten2017-07-26
| | | | | | | | | | | | | | | | | | | | 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/1745Gravatar Adam Cozzette2017-07-25
| |\ | | | | | | Fix issue #1745 - javascript allow dot in filename
* | | Merge remote-tracking branch 'origin/master' into mergeGravatar Jisi Liu2017-07-25
|\| |
* | | Merge from masterGravatar Jisi Liu2017-07-25
| | |
| * | Merge pull request #3407 from bklarson/masterGravatar Adam Cozzette2017-07-25
| |\ \ | | | | | | | | Add declaration for AddDescriptorsImpl()
* | \ \ Merge remote-tracking branch 'origin/3.4.x' into vbGravatar Jisi Liu2017-07-24
|\ \ \ \
| * | | | Omit the zip test if tools are not availableGravatar Jisi Liu2017-07-24
| | | | |
* | | | | Update required version on pre-generated filesGravatar Jisi Liu2017-07-24
| | | | |
* | | | | Update pre generated filesGravatar Jisi Liu2017-07-24
| | | | |
* | | | | Update version number for 3.4.0Gravatar Jisi Liu2017-07-24
|/ / / /
| | * | Put AddDescriptorsImpl() in anonymous namespaceGravatar Brad Larson2017-07-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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/ConformanceTestYilunChongGravatar Yilun Chong2017-07-24
| |\ \ \ | | | | | | | | | | Proto2 test message support to conformance test
| | | | * Fix quotation marksGravatar Adam2017-07-24
| | | | |
| | | | * Fix issue #1745 - javascript allow dot in filenameGravatar Adam2017-07-24
| | |_|/ | |/| |
| * | | Merge pull request #2969 from laszlocsomor/masterGravatar Feng Xiao2017-07-24
| |\ \ \ | | |_|/ | |/| | Windows: support long paths in open/mkdir/access
| * | | Fixed dynamic initialization for C++ liteGravatar Adam Cozzette2017-07-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | remove profileGravatar Jisi Liu2017-07-19
| | | |
| * | | Merge pull request #3375 from TeBoring/3.3.xGravatar Paul Yang2017-07-19
| |\ \ \ | | | | | | | | | | Merge 3.3.x into master
* | | | | Merge master into 3.4.xGravatar Jisi Liu2017-07-18
|\| | | |
* | | | | Merge from Google internal for 3.4 releaseGravatar Jisi Liu2017-07-18
| | | | |
| | * | | Merge 3.3.x into masterGravatar Bo Yang2017-07-18
| | |\ \ \
| * | | | | Support PHP generic services (#3269)Gravatar Matt A2017-07-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add php_generic_services option * Generate PHP generic services * Respect namespaces for generated PHP services * Test PHP generated services * Rename PHP generator service method doc comment function * Correct phpdoc service method case * Test namespaced PHP generic services * Always use the FQCN for PHP generic service input/output * Add generated_service_test to php test.sh * Add php service test protos to CI * Add php service files to php_EXTRA_DIST * Use Interface suffix for php generic services
| * | | | | Merge pull request #3348 from matthauck/fix-gcc41-againGravatar Adam Cozzette2017-07-17
| |\ \ \ \ \ | | | | | | | | | | | | | | Fix map_field_inl.h for gcc 4.1
| * \ \ \ \ \ Merge pull request #3357 from bklarson/masterGravatar Adam Cozzette2017-07-17
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix build when using -Werror=undef