aboutsummaryrefslogtreecommitdiff
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* 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.
* | | 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-3040-819/+968
| |\ \
| * | | 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-2414-81/+950
|\ \ \ \ | |_|_|/ |/| | | Windows: support long paths in open/mkdir/access
| * | | Windows: support long pathsLaszlo Csomor2017-07-1114-81/+950
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-1934-23/+98
|\ \ \ \ | | | | | | | | | | Merge 3.3.x into master
| * \ \ \ Merge 3.3.x into masterBo Yang2017-07-1834-23/+98
| |\ \ \ \
| | * | | | Update C++ generated code.Bo Yang2017-06-2113-13/+13
| | | | | |
| | * | | | Update version number to 3.3.2Bo Yang2017-06-212-4/+4
| | | | | |
| | * | | | 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.
| | * | | | Update C++ generated code.Feng Xiao2017-05-0813-13/+13
| | | | | |
| | * | | | Update version number to 3.3.1Feng Xiao2017-05-082-4/+4
| | | | | |
| | * | | | Merge pull request #3073 from xfxyjwf/3.3.xFeng Xiao2017-05-081-1/+2
| | |\ \ \ \ | | | | | | | | | | | | | | Cherry-pick a bug fix: workaround gcc < 4.5.0 bug
| | | * | | | Workaround gcc < 4.5.0 bugMario J. Rugiero2017-05-081-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See https://gcc.gnu.org/bugzilla/show_bug.cgi?id=189 Signed-off-by: Mario J. Rugiero <mrugiero@gmail.com>
| | * | | | | Fix compilationrandomguy32017-05-061-1/+1
| | | | | | | | | | | | | | | | | | | | | <: is a digraph, so a space is necessary for compilation on certain compilers.
| | * | | | | Fix offset type to match the tables it is used inAlex Merry2017-05-051-1/+1
| | |/ / / /
| | * | | | Add missing LIBRPOTOC_EXPORT.Feng Xiao2017-05-041-2/+2
| | | | | |
| | * | | | Skip C# test in C++ only distribution.Feng Xiao2017-05-041-0/+8
| | | | | |
| | * | | | Add missing files to build files.Feng Xiao2017-05-042-3/+4
| | | | | |
| | * | | | Fix issue 3046: compilation on alpine 3.5Chris Nix2017-05-041-0/+7
| | | | | |
* | | | | | Support PHP generic services (#3269)Matt A2017-07-184-129/+353
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-againAdam Cozzette2017-07-171-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix map_field_inl.h for gcc 4.1
| * | | | | | Fix map_field_inl.h for gcc 4.1Matt Hauck2017-07-111-2/+2
| | |_|/ / / | |/| | | |
* | | | | | Merge pull request #3357 from bklarson/masterAdam Cozzette2017-07-172-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix build when using -Werror=undef
| * | | | | | Fix build when using -Werror=undefBrad Larson2017-07-122-2/+2
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Correct a couple places where macros were being checked when they might not exist in some cases. Fixes #3356.
* | | | | | Merge pull request #3134 from lundefugl/javabug1Feng Xiao2017-07-172-5/+5
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | Issue 3112: Object class with fully qualified name
| * | | | | Issue 3112: Object class with fully qualified namelundefugl2017-05-242-5/+5
| | | | | |
* | | | | | remove pass by reference for php setters (#3344)Brent Shaffer2017-07-171-5/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remove pass by reference for php setters * comments out memory leak test
* | | | | | removes an accidental newline in printing for the php generator (#3333)Brent Shaffer2017-07-131-1/+1
| | | | | |
* | | | | | Add space between arrow and casted type (#3353)Paul Yang2017-07-133-27/+27
| | | | | |
* | | | | | Merge pull request #3327 from htuch/fix-3322Feng Xiao2017-07-131-7/+0
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | Use consistent hash across NDEBUG/!NDEBUG builds.
| * | | | | Use consistent hash across NDEBUG/!NDEBUG builds.Harvey Tuch2017-07-071-7/+0
| | |_|_|/ | |/| | | | | | | | | | | | | Fixes #3322.
* | | | | Fix missing std::tr1::hash on GCC 4.1 (#2907)Matt Hauck2017-07-101-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rather than crashing on use (doh!) better to just declare this platform is missing a proper hash_map/hash_set implementation and use the std::map/std::set emulation. Fixes regression introduced by #1913
* | | | | Add std:: namespace prefix to set and map (#3332)tanderson-google2017-07-0937-80/+78
|/ / / / | | | | | | | | * Remove using std::{set,map}