Commits · 99e186858696f14c7925a95cd833c672748b1f14 · submodule / protobuf

27 Aug, 2015 1 commit
- Add missing files in dist. · 99e18685
  Feng Xiao authored Aug 27, 2015
  
  99e18685
26 Aug, 2015 5 commits
- Merge pull request #728 from dano/py3_str_compat · c7a1f8ec
  Joshua Haberman authored Aug 26, 2015
```
Get all tests passing on Python3 (except Python3.4 cpp implementation)
```
  c7a1f8ec
- Merge pull request #709 from xfxyjwf/map_bug · b00595a3
  Feng Xiao authored Aug 26, 2015
```
Fix JSON map fields parsing.
```
  b00595a3
- Merge pull request #739 from jtattermusch/include_descriptor_proto_master · f6b05f78
  Jon Skeet authored Aug 26, 2015
```
include descriptor.proto in nuget package 
```
  f6b05f78
- include descriptor.proto in nuget package · 72145dff
  Jan Tattermusch authored Aug 26, 2015
  
  72145dff
- Merge pull request #726 from DouglasHeriot/msvc-noinline · cf94f7b7
  Feng Xiao authored Aug 26, 2015
```
Define GOOGLE_ATTRIBUTE_NOINLINE for MSVC. Workaround for VS2015 Release build compiler bug
```
  cf94f7b7
25 Aug, 2015 3 commits

Merge pull request #732 from jskeet/fix-descriptor-proto · f9aed208
Jon Skeet authored Aug 25, 2015
```
Change where we rename Descriptor.cs to DescriptorProtoFile.cs.
```
f9aed208
Remove extraneous TODO · 31d119af
Jon Skeet authored Aug 25, 2015

31d119af

Change where we rename Descriptor.cs to DescriptorProtoFile.cs. · ca89a1a1

Jon Skeet authored Aug 25, 2015

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.

ca89a1a1

22 Aug, 2015 8 commits
- Merge pull request #711 from tamird/python3-prep · 3253634d
  Joshua Haberman authored Aug 22, 2015
```
Remove Python 2.5 cruft
```
  3253634d
- Fix metaclass issue on Python 3. Get text handling tests passing on Python 3. · 38eef02a
  Dan O'Reilly authored Aug 22, 2015
```
Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
```
  38eef02a
- Start work on getting text handled properly on PY3 · fc80874a
  Dan O'Reilly authored Aug 15, 2015
  
  fc80874a
- assertEquals is deprecated · 87993d75
  Tamir Duberstein authored Aug 22, 2015
  
  87993d75
- Use assertIsInstance · 821fcb2d
  Tamir Duberstein authored Aug 12, 2015
  
  821fcb2d
- Clean up exception syntax · 09831c87
  Tamir Duberstein authored Aug 12, 2015
  
  09831c87
- Remove Python 2.5 cruft · 322d8939
  Tamir Duberstein authored Aug 12, 2015
  
  322d8939
- Merge pull request #722 from dano/py2_py3_straddle · 3ff56252
  Joshua Haberman authored Aug 22, 2015
```
Add tox, Python 2.6 compatibility, and many Python 3 compatibility fixes
```
  3ff56252
21 Aug, 2015 5 commits

Set DYLD_LIBRARY_PATH for OSX · 46969b99
Dan O'Reilly authored Aug 21, 2015
```
Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
```
46969b99
Travis now only tests Python2.6 on Linux. · 76f8a3fb
Dan O'Reilly authored Aug 21, 2015
```
Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
```
76f8a3fb

Define GOOGLE_ATTRIBUTE_NOINLINE for MSVC. Workaround for VS2015 Release build compiler bug. · 5021c4d8

Douglas Heriot authored Aug 21, 2015

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?

5021c4d8

Merge pull request #584 from haberman/cwarnings · eb65c69e
Joshua Haberman authored Aug 21, 2015
```
Ruby: Conform to C89/C90 variable declaration rules.
```
eb65c69e
Fix travis build · 3791c805
Dan O'Reilly authored Aug 21, 2015
```
Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
```
3791c805

20 Aug, 2015 8 commits
- Return TypedData_Wrap_Struct directly. · d61e6adf
  Josh Haberman authored Aug 20, 2015
```
Change-Id: I6cf77f01370204ad4bc7b345a040a9a3de1706a0
```
  d61e6adf
- Improve tox.ini, install py26 for travis. · 5de2a81b
  Dan O'Reilly authored Aug 20, 2015
```
Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
```
  5de2a81b
- Remove debug code · afa488c4
  Dan O'Reilly authored Aug 20, 2015
```
Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
```
  afa488c4
- Install tox during travis build. · 5029c7b7
  Dan O'Reilly authored Aug 20, 2015
```
Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
```
  5029c7b7
- Remove ez_setup.py from Makefile.am · 4a0129f6
  Dan O'Reilly authored Aug 20, 2015
```
Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
```
  4a0129f6
- Use tox in travis build. Tweak tox.ini · 416f001a
  Dan O'Reilly authored Aug 20, 2015
```
Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
```
  416f001a
- Merge branch 'py2_py3_straddle' of github.com:dano/protobuf into py2_py3_straddle · de22561b
  Dan O'Reilly authored Aug 20, 2015
  
  de22561b
- Add some clarifying comments. Remove ez_setup.py. · 3bdfb4b6
  Dan O'Reilly authored Aug 20, 2015
```
Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
```
  3bdfb4b6
18 Aug, 2015 1 commit
- Fix duplicate entry in .gitignore · 4fefc07e
  Dan O'Reilly authored Aug 18, 2015
```
Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
```
  4fefc07e
16 Aug, 2015 1 commit
- Make testing cpp implementation optional · 9d689692
  Dan O'Reilly authored Aug 16, 2015
```
Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
```
  9d689692
15 Aug, 2015 5 commits
- Fix --cpp_implementation test failure. Test both pure Python and cpp implementation in tox. · 3083d8ce
  Dan O'Reilly authored Aug 15, 2015
```
Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
```
  3083d8ce
- Just always uses BytseIO in text_format for now · 7601551f
  Dan O'Reilly authored Aug 15, 2015
```
Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
```
  7601551f
- Merge remote-tracking branch 'upstream/master' into py2_py3_straddle · 893b65e4
  Dan O'Reilly authored Aug 15, 2015
  
  893b65e4
- Disable py3* in tox · 7013a75b
  Dan O'Reilly authored Aug 15, 2015
```
Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
```
  7013a75b
- Get Python 2.6 working. · 2621c8ae
  Dan O'Reilly authored Aug 15, 2015
```
Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
```
  2621c8ae
14 Aug, 2015 3 commits
- Merge pull request #720 from jtattermusch/csharp_fixes · 0cb84ee3
  Jon Skeet authored Aug 14, 2015
```
C# fix for TypeInitializer exception.
```
  0cb84ee3
- fix type initialization problem with FileDescriptor · fa2fe35d
  Jan Tattermusch authored Aug 14, 2015
  
  fa2fe35d
- add a failing descriptor test · 143688f6
  Jan Tattermusch authored Aug 14, 2015
  
  143688f6