protobuf

Commit Graph

Author	SHA1	Message	Date
Jisi Liu	06c9dfd9a3	Merge pull request #740 from pherl/beta-1 Fix commandline interface file under heapcheck.	10 years ago
Jisi Liu	01e060f20e	Fix commandline interface file under heapcheck. 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	10 years ago
Feng Xiao	b192ba87f7	Merge remote-tracking branch 'origin/master' into beta-1	10 years ago
Feng Xiao	cf94f7b744	Merge pull request #726 from DouglasHeriot/msvc-noinline Define GOOGLE_ATTRIBUTE_NOINLINE for MSVC. Workaround for VS2015 Release build compiler bug	10 years ago
Feng Xiao	5da0b46811	Merge pull request #734 from TeBoring/beta-1 Fix bugs on windows	10 years ago
Bo Yang	ff7bdad231	Fix bugs on windows	10 years ago
Jisi Liu	ed91f89f73	Merge pull request #735 from pherl/beta-1 Update cmake and BUILD files.	10 years ago
Jisi Liu	b90f9f8073	Update cmake and BUILD files. Change-Id: I17e16fdae6e4d2fb74d178fa5564a609ed58af1d	10 years ago
Jisi Liu	144ea00659	Merge branch 'beta-1' of github.com:google/protobuf into manual-merge	10 years ago
Jisi Liu	4c663d810e	Update descriptor protos. Change-Id: I74a73d3135ec1e0e4d52d741a77456b8e55f038f	10 years ago
Jisi Liu	db45aa117a	Merge branch 'beta-1' of github.com:google/protobuf into manual-merge Change-Id: I83a93fdb119a643fbc884e6ec3624493f6270370	10 years ago
Feng Xiao	cc5a1bfede	Make the PARSER @Deprecated public. (cherry-picking an intenral change).	10 years ago
Jisi Liu	56c4f57bb0	Merge branch 'gcc-c++11-fix' of https://github.com/nsuke/protobuf into beta-1 Manually merge pull request: https://github.com/google/protobuf/pull/674 that fixes the gcc C++11 build.	10 years ago
Feng Xiao	f4ef8fe3b8	Delete incorrectly placed test file.	10 years ago
Feng Xiao	fbb3ef28c9	Merge Java util package to github.	10 years ago
Jon Skeet	f9aed2088d	Merge pull request #732 from jskeet/fix-descriptor-proto Change where we rename Descriptor.cs to DescriptorProtoFile.cs.	10 years ago
Jon Skeet	31d119af22	Remove extraneous TODO	10 years ago
Jon Skeet	ca89a1a118	Change where we rename Descriptor.cs to DescriptorProtoFile.cs. 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.	10 years ago
Feng Xiao	839b180dba	Cherry-pick Java utf8 change.	10 years ago
Feng Xiao	b17ec3ca11	Down-integrate from internal code base.	10 years ago
Feng Xiao	eee38b0c01	Down-integrate from google3.	10 years ago
Joshua Haberman	3253634dcb	Merge pull request #711 from tamird/python3-prep Remove Python 2.5 cruft	10 years ago
Tamir Duberstein	87993d7507	assertEquals is deprecated	10 years ago
Tamir Duberstein	821fcb2ded	Use assertIsInstance	10 years ago
Tamir Duberstein	09831c8768	Clean up exception syntax	10 years ago
Tamir Duberstein	322d8939fc	Remove Python 2.5 cruft	10 years ago
Joshua Haberman	3ff5625231	Merge pull request #722 from dano/py2_py3_straddle Add tox, Python 2.6 compatibility, and many Python 3 compatibility fixes	10 years ago
Dan O'Reilly	46969b99ca	Set DYLD_LIBRARY_PATH for OSX Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>	10 years ago
Dan O'Reilly	76f8a3fbcd	Travis now only tests Python2.6 on Linux. Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>	10 years ago
Jisi Liu	c3bc155ace	Merge branch 'master' of github.com:google/protobuf Change-Id: If3fb07754a734bae610d95124528e073515ac525	10 years ago
Jisi Liu	b0f661181d	Down-integrate from internal branch. Change-Id: Ieb7a2c2fbf35bc2a8fa65b915a5ecb68c83863e4	10 years ago
Douglas Heriot	5021c4d885	Define GOOGLE_ATTRIBUTE_NOINLINE for MSVC. Workaround for VS2015 Release 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?	10 years ago
Joshua Haberman	eb65c69e14	Merge pull request #584 from haberman/cwarnings Ruby: Conform to C89/C90 variable declaration rules.	10 years ago
Dan O'Reilly	3791c8051a	Fix travis build Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>	10 years ago
Josh Haberman	d61e6adfcc	Return TypedData_Wrap_Struct directly. Change-Id: I6cf77f01370204ad4bc7b345a040a9a3de1706a0	10 years ago
Dan O'Reilly	5de2a81b01	Improve tox.ini, install py26 for travis. Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>	10 years ago
Dan O'Reilly	afa488c4d1	Remove debug code Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>	10 years ago
Dan O'Reilly	5029c7b7d3	Install tox during travis build. Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>	10 years ago
Dan O'Reilly	4a0129f680	Remove ez_setup.py from Makefile.am Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>	10 years ago
Dan O'Reilly	416f001adc	Use tox in travis build. Tweak tox.ini Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>	10 years ago
Dan O'Reilly	de22561b7b	Merge branch 'py2_py3_straddle' of github.com:dano/protobuf into py2_py3_straddle	10 years ago
Dan O'Reilly	3bdfb4b695	Add some clarifying comments. Remove ez_setup.py. Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>	10 years ago
Dan O'Reilly	4fefc07ec5	Fix duplicate entry in .gitignore Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>	10 years ago
Dan O'Reilly	9d689692d3	Make testing cpp implementation optional Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>	10 years ago
Dan O'Reilly	3083d8cee7	Fix --cpp_implementation test failure. Test both pure Python and cpp implementation in tox. Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>	10 years ago
Dan O'Reilly	7601551f7c	Just always uses BytseIO in text_format for now Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>	10 years ago
Dan O'Reilly	893b65e469	Merge remote-tracking branch 'upstream/master' into py2_py3_straddle	10 years ago
Dan O'Reilly	7013a75b90	Disable py3* in tox Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>	10 years ago
Dan O'Reilly	2621c8aefb	Get Python 2.6 working. Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>	10 years ago
Jon Skeet	0cb84ee31f	Merge pull request #720 from jtattermusch/csharp_fixes C# fix for TypeInitializer exception.	10 years ago

1 2 3 4 5 ...

2650 Commits (06c9dfd9a3a6fd18604134c03250734c8d33732d) All Branches Search

2650 Commits (06c9dfd9a3a6fd18604134c03250734c8d33732d)

All Branches