aboutsummaryrefslogtreecommitdiff
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | Merge pull request #750 from TeBoring/beta-1Paul Yang2015-08-261-0/+1
|\ \ \ \ | | | | | | | | | | Fix bugs for objectivec
| * | | | Fix bugs for objectivecTeBoring2015-08-261-0/+1
| | | | |
* | | | | Add a TODO to clean-up the LITTLE_ENDIAN macro.Feng Xiao2015-08-261-0/+3
| | | | |
* | | | | Assume LITTLE_ENDIAN for windows build.Feng Xiao2015-08-261-2/+2
| | | | |
* | | | | Remove an unused typedef.Feng Xiao2015-08-261-6/+0
| | | | |
* | | | | Merge remote-tracking branch 'origin/master' into beta-1Feng Xiao2015-08-262-1/+14
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge pull request #709 from xfxyjwf/map_bugFeng Xiao2015-08-262-1/+14
| |\ \ \ \ | | |_|/ / | |/| | | Fix JSON map fields parsing.
| | * | | Fix map fields parsing.Feng Xiao2015-08-112-1/+14
| | | | | | | | | | | | | | | | | | | | Change-Id: If61e16cea84492474a71bbfe985131ec980b0b0a
* | | | | add static cast to silence signedness comparison warningJan Tattermusch2015-08-261-1/+1
| | | | |
* | | | | Fix cmake build on linux.Feng Xiao2015-08-251-2/+4
| |_|/ / |/| | |
* | | | Merge pull request #742 from xfxyjwf/c11_compileFeng Xiao2015-08-252-3/+3
|\ \ \ \ | | | | | | | | | | Fix compile issues with -std=c++11
| * | | | Fix compile issues with -std=c++11Feng Xiao2015-08-252-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This compiles with -std=c++11: message Foo { map<string, Foo> value = 1; } This does not compile: message Foo { map<int32, Foo> value = 1; } Needs to dig more into the underlying issue.
* | | | | Merge pull request #741 from pherl/beta-1Jisi Liu2015-08-254-52/+72
|\ \ \ \ \ | | | | | | | | | | | | fix "memory leaks" in protostream-object files.
| * | | | | fix "memory leaks" in protostream-object files.Jisi Liu2015-08-254-52/+72
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I0aca56802d974cb03cb89c1a294f37068b5b9758
* | | | | | Merge pull request #740 from pherl/beta-1Jisi Liu2015-08-251-5/+5
|\| | | | | | |/ / / / |/| | | | Fix commandline interface file under heapcheck.
| * | | | Fix commandline interface file under heapcheck.Jisi Liu2015-08-251-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The internal down-integrate script probably does not handle the top level macros well. Moved the macro inside of the namespace declrations to avoid down-integrate errors in the future. Change-Id: I3790357f36b0204a2a26577805192a3a1e989df8
* | | | | Merge remote-tracking branch 'origin/master' into beta-1Feng Xiao2015-08-255-20/+21
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / /
| * | | Merge pull request #726 from DouglasHeriot/msvc-noinlineFeng Xiao2015-08-256-23/+31
| |\ \ \ | | | | | | | | | | Define GOOGLE_ATTRIBUTE_NOINLINE for MSVC. Workaround for VS2015 Release build compiler bug
| | * | | Define GOOGLE_ATTRIBUTE_NOINLINE for MSVC. Workaround for VS2015 Release ↵Douglas Heriot2015-08-226-23/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | build compiler bug. See issue #240 - MSVC in VS2015 seems to inline a function it shouldn't. My original workaround was to disable inlining for the whole file, but I found a way to do it on just this specific function using __declspec(noinline). Unfortunately __declspec has to go at the start of the function declaration, while __attribute in GCC can go either before or after. I had to move lots of GOOGLE_ATTRIBUTE_NOLINE to make it compile. I have not yet tested this change with GCC. Will there be other side effects of defining this, given it wasn't previously? I also noticed a few functions marked with both the 'inline' keyword, and GOOGLE_ATTRIBUTE_NOINLINE - huh? Is there an explanation for this, or is it an oversight?
| * | | | Change where we rename Descriptor.cs to DescriptorProtoFile.cs.Jon Skeet2015-08-252-6/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We now do this in protoc instead of the generation simpler. Benefits: - Generation script is simpler - Detection is simpler as we now only need to care about one filename - The embedded descriptor knows itself as "google/protobuf/descriptor.proto" avoiding dependency issues This PR also makes the "invalid dependency" exception clearer in terms of expected and actual dependencies.
| * | | | Remove Python 2.5 cruftTamir Duberstein2015-08-221-14/+6
| |/ / /
* | | | Merge pull request #734 from TeBoring/beta-1Feng Xiao2015-08-2519-61/+110
|\ \ \ \ | | | | | | | | | | Fix bugs on windows
| * | | | Fix bugs on windowsBo Yang2015-08-2532-437/+503
| | | | |
* | | | | Merge branch 'beta-1' of github.com:google/protobuf into manual-mergeJisi Liu2015-08-252-2/+11
|\ \ \ \ \
| * | | | | Make the PARSER @Deprecated public.Feng Xiao2015-08-252-2/+11
| |/ / / / | | | | | | | | | | | | | | | (cherry-picking an intenral change).
* | | | | Update descriptor protos.Jisi Liu2015-08-2513-376/+393
| | | | | | | | | | | | | | | | | | | | Change-Id: I74a73d3135ec1e0e4d52d741a77456b8e55f038f
* | | | | Merge branch 'beta-1' of github.com:google/protobuf into manual-mergeJisi Liu2015-08-25171-2737/+6924
|\| | | | | | | | | | | | | | | | | | | Change-Id: I83a93fdb119a643fbc884e6ec3624493f6270370
| * | | | Cherry-pick Java utf8 change.Feng Xiao2015-08-243-8/+5
| | | | |
| * | | | Down-integrate from internal code base.Feng Xiao2015-08-2311-112/+418
| | | | |
| * | | | Down-integrate from google3.Feng Xiao2015-08-22168-2618/+6502
| | | | |
* | | | | Merge branch 'gcc-c++11-fix' of https://github.com/nsuke/protobuf into beta-1Jisi Liu2015-08-252-9/+4
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | Manually merge pull request: https://github.com/google/protobuf/pull/674 that fixes the gcc C++11 build.
| * | | | Fix gcc C++11 buildNobuaki Sukegawa2015-08-012-9/+4
| | | | |
* | | | | Merge branch 'master' of github.com:google/protobufJisi Liu2015-08-21100-2549/+2495
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | Change-Id: If3fb07754a734bae610d95124528e073515ac525
| * | | | Merge pull request #720 from jtattermusch/csharp_fixesJon Skeet2015-08-141-1/+1
| |\ \ \ \ | | | | | | | | | | | | C# fix for TypeInitializer exception.
| | * | | | fix type initialization problem with FileDescriptorJan Tattermusch2015-08-141-1/+1
| | | | | |
| * | | | | Merge pull request #571 from thomasvl/validation_supportPaul Yang2015-08-145-90/+287
| |\ \ \ \ \ | | |/ / / / | |/| | | | Add support for a file listing expected package to objc prefixes for validation.
| | * | | | Add support for a file listing expected package to objc prefixes for validation.Thomas Van Lenten2015-08-145-90/+287
| | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | - Add a env var to pass a set of expected prefixes for validation. - Report warnings/errors based on the expected prefixes vs. the data in the files compiled. - Use some helpers from common directory.
| * / | | Allow public access to descriptor.proto as a dependency.Jon Skeet2015-08-132-2/+12
| |/ / / | | | | | | | | | | | | | | | | With this in place, generating APIs on github.com/google/googleapis works - previously annotations.proto failed. Currently there's no access to the annotations (stored as extensions) but we could potentially expose those at a later date.
| * | | Merge pull request #700 from jskeet/remove-packed-hackJan Tattermusch2015-08-082-12/+1
| |\ \ \ | | | | | | | | | | Remove our own version of MakeTag now that the main one is fixed.
| | * | | Remove our own version of MakeTag now that the main one is fixed.Jon Skeet2015-08-072-12/+1
| | | | | | | | | | | | | | | | | | | | "Tested" by regenerating code and observing that there are no changes.
| * | | | Merge pull request #694 from jskeet/groupsJon Skeet2015-08-081-4/+1
| |\ \ \ \ | | |/ / / | |/| | | Fix groups handling in C#
| | * | | Skip groups properly.Jon Skeet2015-08-061-4/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now the generated code doesn't need to check for end group tags, as it will skip whole groups at a time. Currently it will ignore extraneous end group tags, which may or may not be a good thing. Renamed ConsumeLastField to SkipLastField as it felt more natural. Removed WireFormat.IsEndGroupTag as it's no longer useful. This mostly fixes issue 688. (Generated code changes coming in next commit.)
| * | | | Merge pull request #645 from zsurocking/masterPaul Yang2015-08-0615-81/+202
| |\ \ \ \ | | | | | | | | | | | | Down integrate. Generate a package name suffix ".nano" for nano messages
| | * \ \ \ Merge remote-tracking branch 'upstream/master'Xiao Hang2015-08-0488-2378/+2035
| | |\ \ \ \
| | * | | | | Generate a package name suffix ".nano" for nano messagesXiao Hang2015-07-295-58/+174
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Also introducing an option javanano_use_deprecated_package to allow users to disable the suffix
| * | | | | | Remove unused .pb.h #includes.Bo Yang2015-08-064-4/+0
| | |_|/ / / | |/| | | |
| * | | | | Change ReadTag and PeekTag to just use 0 as a return value for "end of ↵Jon Skeet2015-08-051-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | stream", rather than using an awkward out parameter. This simplifies quite a lot of code. Generated code in next commit.
| * | | | | Consume unknown fields when parsing.Jon Skeet2015-08-051-1/+2
| | |/ / / | |/| | | | | | | | | | | | | | | | | | This is expected to be the cause of the conformance test failures. Generated code in next commit.
| * | | | Merge pull request #653 from airtimemedia/masterFeng Xiao2015-08-036-13/+7
| |\ \ \ \ | | |_|/ / | |/| | | Various compilation fixes
| | * | | Move pthread include.Tom Hughes2015-07-302-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | Based on pull request feedback. See commit 60c5222 for why the pthread header is necessary.
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-29 10:15:45 +0000