aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge from masterJisi Liu2017-07-2587-1271/+3027
|
* Merge pull request #3413 from pherl/3.4.xJisi Liu2017-07-2524-42/+42
|\ | | | | Update version number for 3.4.0
| * Merge remote-tracking branch 'origin/3.4.x' into vbJisi Liu2017-07-243-23/+36
| |\ | |/ |/|
* | Merge pull request #3414 from pherl/fixzipJisi Liu2017-07-241-22/+32
|\ \ | | | | | | Omit the zip test if tools are not available
| * | Omit the zip test if tools are not availableJisi Liu2017-07-241-22/+32
| | |
* | | Merge pull request #3412 from anandolee/3.4.xJisi Liu2017-07-242-1/+4
|\ \ \ | |/ / |/| | Use keys() instead of iterkeys() to be python3 compatbile.
| * | Add __bool__ as well as __nonzero__ for python3Jie Luo2017-07-241-0/+3
| | |
| * | Use keys() instead of iterkeys() to be python3 compatbile.Jie Luo2017-07-241-1/+1
|/ /
| * 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-2412-18/+18
|/
* Merge pull request #3393 from pherl/3.4.xJisi Liu2017-07-24308-8120/+20323
|\ | | | | Create 3.4.x branch
| * Fix code to use values() insteadJisi Liu2017-07-191-1/+1
| |
| * Update filelist againJisi Liu2017-07-191-0/+1
| |
| * Add lite and python extra_dist filesJisi Liu2017-07-191-0/+4
| |
| * Add java and JS dist files.Jisi Liu2017-07-191-0/+23
| |
| * remove broken imports in JSJisi Liu2017-07-191-2/+0
| |
| * Use itmes() instead of itervalues() to be python3 compatbile.Jisi Liu2017-07-191-1/+1
| |
| * Fix distcheckJisi Liu2017-07-191-0/+1
| |
| * remove profileJisi Liu2017-07-194-2239/+0
| |
| * update build file listJisi Liu2017-07-192-3/+1
| |
| * Update conformance testsJisi Liu2017-07-195-1184/+6
| |
| * Merge master into 3.4.xJisi Liu2017-07-18328-7456/+12078
| |\ | |/ |/|
* | Merge pull request #3390 from danielgtaylor-isp/patch-1Feng Xiao2017-07-181-0/+4
|\ \ | | | | | | Add note about includes to README
| * | Add note about includes to READMEDaniel Taylor2017-07-181-0/+4
| | | | | | | | | Ran into an issue today where a machine had the `protoc` compiler but not the include files. Took a while to sort out, and this added note to the README included in every zip should help.
* | | Merge pull request #3385 from anandolee/masterJie Luo2017-07-181-0/+1
|\ \ \ | |/ / |/| | Set PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION for pure python comformance
| * | Set PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION for pure python comformance testJie Luo2017-07-171-0/+1
| | |
* | | Support PHP generic services (#3269)Matt A2017-07-1814-191/+623
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| | | | |
* | | | | Merge pull request #3372 from dylanetaft/masterAdam Cozzette2017-07-171-1/+9
|\ \ \ \ \ | | | | | | | | | | | | Expand documentation in Readme.md
| * | | | | Expand documentation in Readme.mddylanetaft2017-07-151-1/+9
| | | | | | | | | | | | | | | | | | Add some supporting documentation regarding Closure for those unfamiliar., Also substantiate details for "files in this directory" - including them all will result in a project that does not compile as some are used for test cases and aren't part of the core library.
* | | | | | remove pass by reference for php setters (#3344)Brent Shaffer2017-07-1724-64/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remove pass by reference for php setters * comments out memory leak test
* | | | | | Fix Implicit Return Types (#3363)Richard Fussenegger2017-07-171-2/+2
|/ / / / / | | | | | | | | | | | | | | | | | | | | Both native_slot_merge and native_slot_merge_by_array have no return type declared. GCC implicitly uses int as return type in such cases, however, these functions are actually void.
* | | | | Initial value in generated code cannot be used by c extension. (#3367)Paul Yang2017-07-145-2/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the generated code of previous versions, each php field is given an initial value. In c extension, it was assumed that the field order in the generated code is consistent with upb fields order, so that the correct initial value can be bound to the correct upb field. However, this may not be true. The order of fields in generated code is decided by proto compiler, while the order of upb fields is decided by the hash function used in c extension. This PR fixes the issue by reset the initial value at runtime.
* | | | | removes an accidental newline in printing for the php generator (#3333)Brent Shaffer2017-07-131-1/+1
| | | | |
* | | | | Add map iterator for c extension (#3350)Paul Yang2017-07-136-5/+157
| | | | |
* | | | | 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 repository URL in C# project fileJon Skeet2017-07-131-1/+1
| |_|/ / / |/| | | |
* | | | | C#: Implement IReadOnlyDictionary<K,V> in MapField<K,V>Jean-Rémy Bancel2017-07-122-0/+27
| |_|/ / |/| | |
* | | | 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-0939-84/+82
| | | | | | | | | | | | * Remove using std::{set,map}
* | | | Uncomment php tests (#3301)Paul Yang2017-07-092-416/+416
|/ / /
* | | Merge pull request #2482 from andreaseger/fix_ruby_timestamp_accuracyAdam Cozzette2017-07-062-3/+11
|\ \ \ | | | | | | | | [Ruby] fix floating point accuracy problem in Timestamp#to_f
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-05 07:19:57 +0000