aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Update version number.Feng Xiao2015-08-2610-14/+14
| | | | | Protoc, C++ runtime and Java runtime are updated to v3.0.0-beta-1, other languages are updated to v3.0.0-alpha-4.
* 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
| * | Merge pull request #739 from jtattermusch/include_descriptor_proto_masterJon Skeet2015-08-261-0/+1
| |\ \ | | | | | | | | include descriptor.proto in nuget package
| | * | include descriptor.proto in nuget packageJan Tattermusch2015-08-251-0/+1
| | | |
* | | | Merge pull request #747 from jtattermusch/sign_mismatchFeng Xiao2015-08-261-1/+1
|\ \ \ \ | | | | | | | | | | add static cast to silence signedness comparison warning
| * | | | add static cast to silence signedness comparison warningJan Tattermusch2015-08-261-1/+1
|/ / / /
* | | | Merge pull request #744 from xfxyjwf/cmake_linuxFeng Xiao2015-08-261-2/+4
|\ \ \ \ | | | | | | | | | | Fix cmake build on linux.
| * | | | Fix cmake build on linux.Feng Xiao2015-08-251-2/+4
| | | | |
* | | | | Merge pull request #736 from jtattermusch/fix-descriptor-protoJan Tattermusch2015-08-260-0/+0
|\ \ \ \ \ | | | | | | | | | | | | Backport: Change where we rename Descriptor.cs to DescriptorProtoFile.cs.
| * | | | | Remove extraneous TODOJon Skeet2015-08-251-1/+0
| | | | | |
| * | | | | Change where we rename Descriptor.cs to DescriptorProtoFile.cs.Jon Skeet2015-08-255-123/+122
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 #738 from jtattermusch/include_descriptor_protoJon Skeet2015-08-261-0/+1
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | Include descriptor.proto in nuget package
| * | | | | include descriptor.proto in nuget packageJan Tattermusch2015-08-251-0/+1
| |/ / / /
* | | | | 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-2540-889/+598
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / /
| * | | 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?
| * | | Merge pull request #732 from jskeet/fix-descriptor-protoJon Skeet2015-08-255-124/+122
| |\ \ \ | | | | | | | | | | Change where we rename Descriptor.cs to DescriptorProtoFile.cs.
| | * | | Remove extraneous TODOJon Skeet2015-08-251-1/+0
| | | | |
| | * | | Change where we rename Descriptor.cs to DescriptorProtoFile.cs.Jon Skeet2015-08-255-123/+122
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 #711 from tamird/python3-prepJoshua Haberman2015-08-226-41/+25
| |\ \ \ | | | | | | | | | | Remove Python 2.5 cruft
| | * | | assertEquals is deprecatedTamir Duberstein2015-08-221-4/+4
| | | | |
| | * | | Use assertIsInstanceTamir Duberstein2015-08-223-17/+13
| | | | |
| | * | | Clean up exception syntaxTamir Duberstein2015-08-221-2/+0
| | | | |
| | * | | Remove Python 2.5 cruftTamir Duberstein2015-08-222-18/+8
| |/ / /
| * | | Merge pull request #722 from dano/py2_py3_straddleJoshua Haberman2015-08-2231-728/+448
| |\ \ \ | | | | | | | | | | Add tox, Python 2.6 compatibility, and many Python 3 compatibility fixes
| | * | | Set DYLD_LIBRARY_PATH for OSXDan O'Reilly2015-08-211-0/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
| | * | | Travis now only tests Python2.6 on Linux.Dan O'Reilly2015-08-211-6/+21
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
| | * | | Fix travis buildDan O'Reilly2015-08-202-0/+3
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
| | * | | Improve tox.ini, install py26 for travis.Dan O'Reilly2015-08-202-12/+24
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
| | * | | Remove debug codeDan O'Reilly2015-08-201-1/+0
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
| | * | | Install tox during travis build.Dan O'Reilly2015-08-201-0/+2
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
| | * | | Remove ez_setup.py from Makefile.amDan O'Reilly2015-08-201-1/+0
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
| | * | | Use tox in travis build. Tweak tox.iniDan O'Reilly2015-08-203-10/+6
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
| | * | | Merge branch 'py2_py3_straddle' of github.com:dano/protobuf into ↵Dan O'Reilly2015-08-201-1/+0
| | |\ \ \ | | | | | | | | | | | | | | | | | | py2_py3_straddle
| | | * | | Fix duplicate entry in .gitignoreDan O'Reilly2015-08-181-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
| | * | | | Add some clarifying comments. Remove ez_setup.py.Dan O'Reilly2015-08-204-345/+5
| | |/ / / | | | | | | | | | | | | | | | Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
| | * | | Make testing cpp implementation optionalDan O'Reilly2015-08-161-2/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
| | * | | Fix --cpp_implementation test failure. Test both pure Python and cpp ↵Dan O'Reilly2015-08-152-8/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | implementation in tox. Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
| | * | | Just always uses BytseIO in text_format for nowDan O'Reilly2015-08-141-4/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
| | * | | Merge remote-tracking branch 'upstream/master' into py2_py3_straddleDan O'Reilly2015-08-1410-244/+471
| | |\| |
| | * | | Disable py3* in toxDan O'Reilly2015-08-141-1/+2
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-27 11:38:14 +0000