aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* | | source code info for interpreted options; fix source code info for extension ↵Joshua Humphries2018-03-264-68/+748
| | | | | | | | | | | | | | | | | | | | | | | | | | | range options (#4342) * when interpreting options, rewrite file descriptor's source code info - so that interpreted option paths have correct location information - so that corresponding uninterpreted option paths are removed also includes a fix to source code locations for extension range options
* | | Merge pull request #4431 from xfxyjwf/rmnanoFeng Xiao2018-03-2669-17060/+11
|\ \ \ | | | | | | | | Remove javanano.
| * | | Remove javanano.Feng Xiao2018-03-2669-17060/+14
| | | |
* | | | Fixes MSVC compiler warning C4800 "Forcing value to bool 'true' or 'false'" ↵Alexey Malov2018-03-262-2/+2
| | | | | | | | | | | | | | | | (#4350)
* | | | Merge pull request #4395 from stone4774/fixbug_enum2json2Feng Xiao2018-03-265-17/+66
|\ \ \ \ | | | | | | | | | | Fix bug: whether always_print_enums_as_ints is true or false, it alwa…
| * \ \ \ Merge branch 'master' into fixbug_enum2json2stone47742018-03-22339-14979/+19144
| |\ \ \ \ | | | |/ / | | |/| |
| * | | | Use the first enum value instead of 0 in ↵stone47742018-03-211-1/+1
| | | | | | | | | | | | | | | | | | | | DefaultValueObjectWriter::FindEnumDefault
| * | | | Fix bug: whether always_print_enums_as_ints is true or false, it always ↵stone47742018-03-195-17/+66
| | | | | | | | | | | | | | | | | | | | print the default value of enums as strings
* | | | | Merge pull request #4424 from egorpugin/patch-1Feng Xiao2018-03-261-3/+6
|\ \ \ \ \ | | | | | | | | | | | | Fix missing LIBPROTOC_EXPORT.
| * | | | | Fix missing LIBPROTOC_EXPORT.Egor Pugin2018-03-251-3/+6
|/ / / / / | | | | | | | | | | This makes possible to build grpc_php_plugin with protobuf in shared mode.
* | | | | Merge pull request #4413 from pmuetschard/msvcAdam Cozzette2018-03-231-13/+6
|\ \ \ \ \ | | | | | | | | | | | | Don't assume Windows builds use MSVC.
| * | | | | Don't assume Windows builds use MSVC.Pascal Muetschard2018-03-221-13/+6
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | Switch to using the MSVC options, not based on the cpu, but based on the compiler name. This allows building on Windows with MSYS or MinGW's gcc.
* | | | | Merge pull request #4422 from acozzette/ruby-conformanceAdam Cozzette2018-03-231-0/+2
|\ \ \ \ \ | | | | | | | | | | | | Updated Ruby conformance test failure list
| * | | | | Updated Ruby conformance test failure listAdam Cozzette2018-03-231-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit adds two entries to the conformance failure list for Ruby. It seems that these particular test cases have been failing since they were introduced in 5140bae3834c40208e44b1eeb947485a832387a7, so there has not been any regression.
* | | | | | Merge pull request #4421 from acozzette/fix-bazel-buildAdam Cozzette2018-03-231-0/+3
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Added missing .inc files to BUILD
| * | | | | Added missing .inc files to BUILDAdam Cozzette2018-03-231-0/+3
|/ / / / / | | | | | | | | | | | | | | | This fixes the Bazel build.
* | | | | Merge pull request #4346 from BSBandme/performance_resultYilun Chong2018-03-222-1/+318
|\ \ \ \ \ | |_|_|/ / |/| | | | Add performance.md and add instruction for linking tcmalloc
| * | | | Add performance.md and add instruction for linking tcmallocYilun Chong2018-03-222-1/+318
| | | | |
* | | | | Merge pull request #4412 from acozzette/remove-old-filesAdam Cozzette2018-03-2224-4907/+2
|\ \ \ \ \ | |_|/ / / |/| | | | Removed some unused C++ source files
| * | | | Removed some unused C++ source filesAdam Cozzette2018-03-2224-4907/+2
|/ / / /
* | | | Merge pull request #4387 from acozzette/down-integrateAdam Cozzette2018-03-20312-14342/+15463
|\ \ \ \ | | | | | | | | | | Integrated internal changes from Google
| * | | | Removed unused variables in repeated_scalar_container.ccAdam Cozzette2018-03-201-12/+0
| | | | |
| * | | | Try using a new version of Visual Studio on AppVeyorAdam Cozzette2018-03-201-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | We need to use a new enough version to ensure that constexpr is available.
| * | | | Removed unused code pertaining to shared_ptrAdam Cozzette2018-03-201-7/+0
| | | | |
| * | | | Updated conformance failure listsAdam Cozzette2018-03-203-3/+0
| | | | |
| * | | | Added map_lite_test.proto to fix LiteTestAdam Cozzette2018-03-203-0/+113
| | | | |
| * | | | Added pyext/thread_unsafe_shared_ptr.hAdam Cozzette2018-03-202-0/+105
| | | | |
| * | | | Removed unrecognized option from no_package.protoAdam Cozzette2018-03-201-3/+1
| | | | |
| * | | | Added new test source files to Makefile.amAdam Cozzette2018-03-201-0/+4
| | | | |
| * | | | Removed use of some type traitsAdam Cozzette2018-03-203-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | Pre-5.1.0 versions of GCC do not support these particular type traits (see https://github.com/google/protobuf/issues/417).
| * | | | Include no_package.proto in Python testAdam Cozzette2018-03-142-0/+2
| | | | |
| * | | | Deleted scoped_ptr.hAdam Cozzette2018-03-1427-311/+49
| | | | | | | | | | | | | | | | | | | | | | | | | We no longer need this, now that we have finished the switch to C++11 and are using std::unique_ptr.
| * | | | Updated checked-in generated codeAdam Cozzette2018-03-142-4/+4
| | | | |
| * | | | Fixed up proto3_lite_unittest.ccAdam Cozzette2018-03-141-11/+11
| | | | |
| * | | | Merge branch 'master' into down-integrateAdam Cozzette2018-03-1333-697/+3583
| |\ \ \ \
| * | | | | Integrated internal changes from GoogleAdam Cozzette2018-03-13282-14041/+15223
| | | | | |
* | | | | | Merge pull request #4361 from BSBandme/go_benchmarkYilun Chong2018-03-209-15/+243
|\ \ \ \ \ \ | | | | | | | | | | | | | | Add go benchmark
| * | | | | | Change to deal all messages in one loopYilun Chong2018-03-191-18/+19
| | | | | | |
| * | | | | | Rewrite go_benchmarkBSBandme2018-03-142-95/+82
| | | | | | |
| * | | | | | some fixBSBandme2018-03-132-35/+36
| | | | | | |
| * | | | | | Add go benchmarkBSBandme2018-03-079-15/+254
| | |_|/ / / | |/| | | |
* | | | | | Merge pull request #4345 from jskeet/list-json-nullFeng Xiao2018-03-203-2/+37
|\ \ \ \ \ \ | | | | | | | | | | | | | | Allow null value in JSON representation of ListValue
| * | | | | | Add conformance test for null value in list JSONJon Skeet2018-03-011-0/+18
| | | | | | |
| * | | | | | Allow list values to be null when parsingJon Skeet2018-03-012-2/+19
| |/ / / / /
* | | | | | Merge pull request #4397 from pherl/catlogJisi Liu2018-03-191-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Cat the test-suite.log on errors for presubmits
| * | | | | | Cat the test-suite.log on errors for presubitsJisi Liu2018-03-191-1/+1
|/ / / / / /
* | | | | | Merge pull request #4371 from Rasrack/gnuc_minorAdam Cozzette2018-03-151-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix spelling error of __GNUC_MINOR__
| * | | | | | Fix spelling error of __GNUC_MINOR__Adam Aili2018-03-101-1/+1
| | | | | | |
* | | | | | | Merge pull request #4370 from felixjendrusch/objc-output-stream-write-checkThomas Van Lenten2018-03-142-1/+14
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Objective-C: Check return value on write of raw pointer
| * | | | | | | Check return value on write of raw pointerFelix Jendrusch2018-03-081-1/+4
| | | | | | | |