aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAge
...
| * | | | Fix bugs for objectivecGravatar TeBoring2015-08-26
| | | | |
* | | | | Merge branch 'master' of github.com:google/protobuf into beta-1Gravatar Feng Xiao2015-08-26
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge pull request #728 from dano/py3_str_compatGravatar Joshua Haberman2015-08-26
| |\ \ \ \ | | | | | | | | | | | | Get all tests passing on Python3 (except Python3.4 cpp implementation)
* | | | | | Update post_process_dist.shGravatar Feng Xiao2015-08-26
| | | | | | | | | | | | | | | | | | | | | | | | vsproject files no longer exist.
* | | | | | Merge pull request #751 from xfxyjwf/version_numberGravatar Feng Xiao2015-08-26
|\ \ \ \ \ \ | | | | | | | | | | | | | | Update version number.
* \ \ \ \ \ \ Merge pull request #752 from google/jtattermusch-patch-1Gravatar Feng Xiao2015-08-26
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Update README.md for C#
| * | | | | | | Update README.md for C#Gravatar Jan Tattermusch2015-08-26
|/ / / / / / /
| * | | | | | Update version number.Gravatar Feng Xiao2015-08-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Protoc, C++ runtime and Java runtime are updated to v3.0.0-beta-1, other languages are updated to v3.0.0-alpha-4.
* | | | | | | Merge pull request #749 from xfxyjwf/mingw_endianGravatar Feng Xiao2015-08-26
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Assume LITTLE_ENDIAN for windows build
| * | | | | | | Add a TODO to clean-up the LITTLE_ENDIAN macro.Gravatar Feng Xiao2015-08-26
| | | | | | | |
| * | | | | | | Assume LITTLE_ENDIAN for windows build.Gravatar Feng Xiao2015-08-26
|/ / / / / / /
* | | | | | | Merge pull request #748 from xfxyjwf/unused_typedefGravatar Feng Xiao2015-08-26
|\| | | | | | | | | | | | | | | | | | | | Remove an unused typedef.
| * | | | | | Remove an unused typedef.Gravatar Feng Xiao2015-08-26
|/ / / / / /
* | | | | | Merge remote-tracking branch 'origin/master' into beta-1Gravatar Feng Xiao2015-08-26
|\| | | | |
| * | | | | Merge pull request #709 from xfxyjwf/map_bugGravatar Feng Xiao2015-08-26
| |\ \ \ \ \ | | | | | | | | | | | | | | Fix JSON map fields parsing.
* | \ \ \ \ \ Merge pull request #747 from jtattermusch/sign_mismatchGravatar Feng Xiao2015-08-26
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | add static cast to silence signedness comparison warning
| * | | | | | | add static cast to silence signedness comparison warningGravatar Jan Tattermusch2015-08-26
|/ / / / / / /
| | | | | * / Fix the no-op definitions of GOOGLE_PREDICT_{TRUE,FALSE}Gravatar Hans Wennborg2015-08-26
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updating to the current protobuf version caused the following build errors in Chromium when using Clang on Windows: ..\..\third_party\protobuf\src\google/protobuf/stubs/fastmem.h(67,43) : error: equality comparison with extraneous parentheses [-Werror,-Wparentheses-equality] if (GOOGLE_PREDICT_FALSE(n_rounded_down == 0)) { // n <= 7 ~~~~~~~~~~~~~~~^~~~ The problem is that on Windows, GOOGLE_PREDICT_FALSE is #defined to nothing, so the code expands to 'if ((n_rounded_down == 0))', which Clang warns about. Clang would not have warned if the extra parentheses came from the macro, but in this case they don't because the macro is just dropped. Fix this by making the macros behave as an identity function instead of just getting dropped. This is closer to what these macros look like in stubs/port.h internally.
* | | | | | Merge pull request #744 from xfxyjwf/cmake_linuxGravatar Feng Xiao2015-08-26
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix cmake build on linux.
* \ \ \ \ \ \ Merge pull request #736 from jtattermusch/fix-descriptor-protoGravatar Jan Tattermusch2015-08-26
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | Backport: Change where we rename Descriptor.cs to DescriptorProtoFile.cs.
| | * | | | | Fix cmake build on linux.Gravatar Feng Xiao2015-08-25
| | | | | | |
* | | | | | | Merge pull request #738 from jtattermusch/include_descriptor_protoGravatar Jon Skeet2015-08-26
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | Include descriptor.proto in nuget package
| | | * | | | Merge pull request #739 from jtattermusch/include_descriptor_proto_masterGravatar Jon Skeet2015-08-26
| | | |\ \ \ \ | | | | | | | | | | | | | | | | include descriptor.proto in nuget package
* | | | \ \ \ \ Merge pull request #742 from xfxyjwf/c11_compileGravatar Feng Xiao2015-08-25
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Fix compile issues with -std=c++11
| * | | | | | | | Fix compile issues with -std=c++11Gravatar Feng Xiao2015-08-25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-1Gravatar Jisi Liu2015-08-25
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | fix "memory leaks" in protostream-object files.
| * | | | | | | | | fix "memory leaks" in protostream-object files.Gravatar Jisi Liu2015-08-25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I0aca56802d974cb03cb89c1a294f37068b5b9758
* | | | | | | | | | Merge pull request #740 from pherl/beta-1Gravatar Jisi Liu2015-08-25
|\| | | | | | | | | | |/ / / / / / / / |/| | | | | | | | Fix commandline interface file under heapcheck.
| * | | | | | | | Fix commandline interface file under heapcheck.Gravatar Jisi Liu2015-08-25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-1Gravatar Feng Xiao2015-08-25
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | / / / / / | | |_|/ / / / / | |/| | | | | |
| | | | * | | | include descriptor.proto in nuget packageGravatar Jan Tattermusch2015-08-25
| | | | | | | |
| | * | | | | | include descriptor.proto in nuget packageGravatar Jan Tattermusch2015-08-25
| |/ / / / / / |/| | | | | |
| * | | | | | Merge pull request #726 from DouglasHeriot/msvc-noinlineGravatar Feng Xiao2015-08-25
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | | Define GOOGLE_ATTRIBUTE_NOINLINE for MSVC. Workaround for VS2015 Release build compiler bug
| | | * | | | Remove extraneous TODOGravatar Jon Skeet2015-08-25
| | | | | | |
| | | * | | | Change where we rename Descriptor.cs to DescriptorProtoFile.cs.Gravatar Jon Skeet2015-08-25
| |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | Merge pull request #734 from TeBoring/beta-1Gravatar Feng Xiao2015-08-25
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix bugs on windows
| * | | | | | Fix bugs on windowsGravatar Bo Yang2015-08-25
| | | | | | |
* | | | | | | Merge pull request #735 from pherl/beta-1Gravatar Jisi Liu2015-08-25
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Update cmake and BUILD files.
| * | | | | | | Update cmake and BUILD files.Gravatar Jisi Liu2015-08-25
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | Change-Id: I17e16fdae6e4d2fb74d178fa5564a609ed58af1d
* | | | | | | Merge branch 'beta-1' of github.com:google/protobuf into manual-mergeGravatar Jisi Liu2015-08-25
|\ \ \ \ \ \ \
* | | | | | | | Update descriptor protos.Gravatar Jisi Liu2015-08-25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I74a73d3135ec1e0e4d52d741a77456b8e55f038f
* | | | | | | | Merge branch 'beta-1' of github.com:google/protobuf into manual-mergeGravatar Jisi Liu2015-08-25
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I83a93fdb119a643fbc884e6ec3624493f6270370
| | * | | | | | | Make the PARSER @Deprecated public.Gravatar Feng Xiao2015-08-25
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | (cherry-picking an intenral change).
* | | | | | | | Merge branch 'gcc-c++11-fix' of https://github.com/nsuke/protobuf into beta-1Gravatar Jisi Liu2015-08-25
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Manually merge pull request: https://github.com/google/protobuf/pull/674 that fixes the gcc C++11 build.
| | * | | | | | | Delete incorrectly placed test file.Gravatar Feng Xiao2015-08-25
| | | | | | | | |
| | * | | | | | | Merge Java util package to github.Gravatar Feng Xiao2015-08-25
| | |/ / / / / /
| | | * | | | | Merge pull request #732 from jskeet/fix-descriptor-protoGravatar Jon Skeet2015-08-25
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | Change where we rename Descriptor.cs to DescriptorProtoFile.cs.
| | | | * | | | | Remove extraneous TODOGravatar Jon Skeet2015-08-25
| | | | | | | | |
| | | | * | | | | Change where we rename Descriptor.cs to DescriptorProtoFile.cs.Gravatar Jon Skeet2015-08-25
| | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| | * | | | | | Cherry-pick Java utf8 change.Gravatar Feng Xiao2015-08-24
| | | | | | | |
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-04 05:44:01 +0000