AuroraMiddleware/protobuf
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity
2,725 Commits 35 Branches 138 Tags 124 MiB
0a22fe59b7
Commit Graph

2725 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dan O'Reilly
46969b99ca Set DYLD_LIBRARY_PATH for OSX 
Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
 2015-08-21 19:28:18 -04:00
Dan O'Reilly
76f8a3fbcd Travis now only tests Python2.6 on Linux. 
Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
 2015-08-21 18:51:56 -04:00
Jisi Liu
c3bc155ace Merge branch 'master' of github.com:google/protobuf 
Change-Id: If3fb07754a734bae610d95124528e073515ac525
 2015-08-21 11:44:49 -07:00
Jisi Liu
b0f661181d Down-integrate from internal branch. 
Change-Id: Ieb7a2c2fbf35bc2a8fa65b915a5ecb68c83863e4
 2015-08-21 11:18:45 -07:00
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?
 2015-08-22 02:05:40 +10:00
Joshua Haberman
eb65c69e14 Merge pull request #584 from haberman/cwarnings 
Ruby: Conform to C89/C90 variable declaration rules.
 2015-08-21 09:00:40 -07:00
Dan O'Reilly
3791c8051a Fix travis build 
Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
 2015-08-20 20:49:45 -04:00
Josh Haberman
d61e6adfcc Return TypedData_Wrap_Struct directly. 
Change-Id: I6cf77f01370204ad4bc7b345a040a9a3de1706a0
 2015-08-20 16:41:32 -07:00
Dan O'Reilly
5de2a81b01 Improve tox.ini, install py26 for travis. 
Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
 2015-08-20 18:19:56 -04:00
Dan O'Reilly
afa488c4d1 Remove debug code 
Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
 2015-08-20 15:51:06 -04:00
Dan O'Reilly
5029c7b7d3 Install tox during travis build. 
Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
 2015-08-20 15:45:53 -04:00
Dan O'Reilly
4a0129f680 Remove ez_setup.py from Makefile.am 
Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
 2015-08-20 15:33:01 -04:00
Dan O'Reilly
416f001adc Use tox in travis build. Tweak tox.ini 
Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
 2015-08-20 15:29:10 -04:00
Dan O'Reilly
de22561b7b Merge branch 'py2_py3_straddle' of github.com:dano/protobuf into py2_py3_straddle 2015-08-20 13:57:03 -04:00
Dan O'Reilly
3bdfb4b695 Add some clarifying comments. Remove ez_setup.py. 
Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
 2015-08-20 13:52:19 -04:00
Dan O'Reilly
4fefc07ec5 Fix duplicate entry in .gitignore 
Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
 2015-08-18 11:31:37 -04:00
Dan O'Reilly
9d689692d3 Make testing cpp implementation optional 
Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
 2015-08-16 13:56:25 -04:00
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>
 2015-08-15 10:07:38 -04:00
Dan O'Reilly
7601551f7c Just always uses BytseIO in text_format for now 
Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
 2015-08-14 23:22:47 -04:00
Dan O'Reilly
893b65e469 Merge remote-tracking branch 'upstream/master' into py2_py3_straddle 2015-08-14 23:09:58 -04:00
Dan O'Reilly
7013a75b90 Disable py3* in tox 
Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
 2015-08-14 23:09:29 -04:00
Dan O'Reilly
2621c8aefb Get Python 2.6 working. 
Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
 2015-08-14 22:54:53 -04:00
Jon Skeet
0cb84ee31f Merge pull request #720 from jtattermusch/csharp_fixes 
C# fix for TypeInitializer exception.
 2015-08-14 22:12:02 +01:00
Jan Tattermusch
fa2fe35dec fix type initialization problem with FileDescriptor 2015-08-14 13:38:34 -07:00
Jan Tattermusch
143688f68b add a failing descriptor test 2015-08-14 13:23:44 -07:00
Jan Tattermusch
a55a4449ef remove duplicate test case 2015-08-14 13:16:04 -07:00
Dan O'Reilly
d06adbd4a4 Fix usage of assertItemsEqual on Py3 
Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
 2015-08-14 16:16:00 -04:00
Dan O'Reilly
3d5aa6aef9 Fix some more Python 3 compat issues 
Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
 2015-08-14 16:12:34 -04:00
Paul Yang
5c370cc55f Merge pull request #571 from thomasvl/validation_support 
Add support for a file listing expected package to objc prefixes for validation.
 2015-08-14 13:06:43 -07:00
Dan O'Reilly
fe7d9379df Fixing some long/int bugs 
Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
 2015-08-14 15:26:33 -04:00
Dan O'Reilly
6654e77f1d Merge remote-tracking branch 'upstream/master' into py2_py3_straddle 2015-08-14 14:33:13 -04:00
Thomas Van Lenten
4e43931eaf Add support for a file listing expected package to objc prefixes for validation. 
- 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.
 2015-08-14 13:34:51 -04:00
Joshua Haberman
53435df594 Merge pull request #716 from haberman/fixruby 
Fixed several Ruby conformance test cases through upb update.
 2015-08-13 13:40:09 -07:00
Jan Tattermusch
2093749caf Merge pull request #718 from jskeet/descriptor-descriptor 
Allow public access to descriptor.proto as a dependency.
 2015-08-13 09:23:29 -07:00
Jon Skeet
a39ababb7c Allow public access to descriptor.proto as a dependency. 
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.
 2015-08-13 12:01:41 +01:00
Feng Xiao
f818183f9b Merge pull request #673 from podsvirov/topic-cmake-install 
Install protobuf from cmake project
 2015-08-12 23:07:54 -07:00
Dan O'Reilly
981d6bf2f7 Build protobuf files in as part of tox runs. 
Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
 2015-08-13 01:24:05 -04:00
Dan O'Reilly
833c046fb7 Fixing some tests 
Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
 2015-08-13 01:17:26 -04:00
Dan O'Reilly
e47cdd5a55 Merge remote-tracking branch 'upstream/master' into py2_py3_straddle 
Conflicts:
	python/google/protobuf/descriptor_pool.py
	python/google/protobuf/internal/api_implementation_default_test.py
	python/google/protobuf/internal/cpp_message.py
	python/google/protobuf/internal/descriptor_database_test.py
	python/google/protobuf/internal/descriptor_pool_test.py
	python/google/protobuf/internal/descriptor_python_test.py
	python/google/protobuf/internal/descriptor_test.py
	python/google/protobuf/internal/generator_test.py
	python/google/protobuf/internal/message_factory_python_test.py
	python/google/protobuf/internal/message_factory_test.py
	python/google/protobuf/internal/message_test.py
	python/google/protobuf/internal/proto_builder_test.py
	python/google/protobuf/internal/python_message.py
	python/google/protobuf/internal/reflection_test.py
	python/google/protobuf/internal/service_reflection_test.py
	python/google/protobuf/internal/symbol_database_test.py
	python/google/protobuf/internal/text_encoding_test.py
	python/google/protobuf/internal/text_format_test.py
	python/google/protobuf/internal/unknown_fields_test.py
	python/google/protobuf/internal/wire_format_test.py
	python/google/protobuf/pyext/descriptor_cpp2_test.py
	python/google/protobuf/pyext/message_factory_cpp2_test.py
	python/google/protobuf/pyext/reflection_cpp2_generated_test.py
	python/setup.py
	ruby/lib/google/protobuf/message_exts.rb
 2015-08-12 23:57:46 -04:00
Josh Haberman
5bdf4a4271 Fixed several Ruby conformance test cases through upb update. 
Change-Id: Ief77de7134e05e07b1a7e3970d49880c2d5e6fe9
 2015-08-12 18:50:15 -07:00
Feng Xiao
38a56ee4b1 Merge pull request #702 from jtattermusch/visual_studio_build_static_runtime 
Link runtime statically for VS build
 2015-08-12 14:11:12 -07:00
Jan Tattermusch
9bdeba479b only link runtime libraries statically for a static build 2015-08-12 12:47:02 -07:00
Feng Xiao
bd11198f69 Fix map fields parsing. 
Change-Id: If61e16cea84492474a71bbfe985131ec980b0b0a
 2015-08-11 17:19:54 -07:00
Paul Yang
edaefac5d2 Merge pull request #706 from thomasvl/revert_any_change_2 
Revert "Add packFrom, unpackTo and is in google.protobuf.Any."
 2015-08-11 13:43:45 -07:00
Thomas Van Lenten
1c33d34e34 Revert "Add packFrom, unpackTo and is in google.protobuf.Any." 
This reverts commit 7366efd81e.

Still some discussion about the api to expose the helpers with.
 2015-08-11 16:22:47 -04:00
Paul Yang
63778e537a Merge pull request #649 from cijianzy/master 
Update GPBWellKnownTypes.m
 2015-08-11 13:02:50 -07:00
Jan Tattermusch
6994b07f14 Merge pull request #703 from jskeet/more-todos 
More TODOs done.
 2015-08-10 14:39:40 -07:00
Jon Skeet
f2732c7af1 More TODOs done. 
- Removed a TODO without change in DescriptorPool.LookupSymbol - the TODOs were around performance, and this is only used during descriptor initialization
- Make the CodedInputStream limits read-only, adding a static factory method for the rare cases when this is useful
- Extracted IDeepCloneable into its own file.
 2015-08-10 19:18:18 +01:00
Jon Skeet
29fe8d223e Merge pull request #701 from jskeet/map-views 
Implement Keys and Values as views in MapField
 2015-08-10 12:44:49 +01:00
Jon Skeet
4deea8c231 Fix parameter name in exception. 2015-08-10 09:03:43 +01:00