aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAge
* It helps if you write macros correctlyGravatar Peter Kasting2015-08-27
|
* Try modifying check in hopes of passing upstream buildGravatar Peter Kasting2015-08-27
|
* Review commentsGravatar Peter Kasting2015-08-27
|
* Refine check for unordered_{map|set} availability.Gravatar Peter Kasting2015-08-27
| | | | | | | It's not enough to check for C++11 language support, as it's possible for projects to enable C++11 language and library features independently (e.g. Chromium currently does this). Instead, explicitly check the library version to see if it is recent enough to include unordered_{map|set}.
* Merge pull request #746 from zmodem/fix_predict_macros2Gravatar Feng Xiao2015-08-27
|\ | | | | Fix the no-op definitions of GOOGLE_PREDICT_{TRUE,FALSE}
* \ Merge pull request #767 from pkasting/portGravatar Feng Xiao2015-08-27
|\ \ | | | | | | Avoid #including system headers from inside a namespace.
| * | Avoid #including system headers from inside a namespace.Gravatar Peter Kasting2015-08-27
|/ / | | | | | | | | | | | | | | | | port.h #includes various headers in order to define byteswap functions, but it currently does so from inside the google::protobuf namespace. This can cause bizarre symbol conflicts and other build errors as these headers' contents are then included inside this namespace. Instead, #include the relevant headers above the namespace declarations.
* | Merge pull request #728 from dano/py3_str_compatGravatar Joshua Haberman2015-08-26
|\ \ | | | | | | Get all tests passing on Python3 (except Python3.4 cpp implementation)
* \ \ Merge pull request #709 from xfxyjwf/map_bugGravatar Feng Xiao2015-08-26
|\ \ \ | | | | | | | | Fix JSON map fields parsing.
| | | * 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 #739 from jtattermusch/include_descriptor_proto_masterGravatar Jon Skeet2015-08-26
|\ \ \ | | | | | | | | include descriptor.proto in nuget package
| * | | 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
* | | | 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.
* | | | Merge pull request #711 from tamird/python3-prepGravatar Joshua Haberman2015-08-22
|\ \ \ \ | | | | | | | | | | Remove Python 2.5 cruft
| | | | * Fix metaclass issue on Python 3. Get text handling tests passing on Python 3.Gravatar Dan O'Reilly2015-08-22
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
| | | | * Start work on getting text handled properly on PY3Gravatar Dan O'Reilly2015-08-22
| |_|_|/ |/| | |
| * | | assertEquals is deprecatedGravatar Tamir Duberstein2015-08-22
| | | |
| * | | Use assertIsInstanceGravatar Tamir Duberstein2015-08-22
| | | |
| * | | Clean up exception syntaxGravatar Tamir Duberstein2015-08-22
| | | |
| * | | Remove Python 2.5 cruftGravatar Tamir Duberstein2015-08-22
|/ / /
* | | Merge pull request #722 from dano/py2_py3_straddleGravatar Joshua Haberman2015-08-22
|\ \ \ | | | | | | | | Add tox, Python 2.6 compatibility, and many Python 3 compatibility fixes
| * | | Set DYLD_LIBRARY_PATH for OSXGravatar Dan O'Reilly2015-08-21
| | | | | | | | | | | | | | | | Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
| * | | Travis now only tests Python2.6 on Linux.Gravatar Dan O'Reilly2015-08-21
| | | | | | | | | | | | | | | | Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
| | * | Define GOOGLE_ATTRIBUTE_NOINLINE for MSVC. Workaround for VS2015 Release ↵Gravatar Douglas Heriot2015-08-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 #584 from haberman/cwarningsGravatar Joshua Haberman2015-08-21
|\ \ \ \ | |_|/ / |/| | | Ruby: Conform to C89/C90 variable declaration rules.
| | * | Fix travis buildGravatar Dan O'Reilly2015-08-20
| | | | | | | | | | | | | | | | Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
| * | | Return TypedData_Wrap_Struct directly.Gravatar Josh Haberman2015-08-20
| | | | | | | | | | | | | | | | Change-Id: I6cf77f01370204ad4bc7b345a040a9a3de1706a0
| | * | Improve tox.ini, install py26 for travis.Gravatar Dan O'Reilly2015-08-20
| | | | | | | | | | | | | | | | Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
| | * | Remove debug codeGravatar Dan O'Reilly2015-08-20
| | | | | | | | | | | | | | | | Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
| | * | Install tox during travis build.Gravatar Dan O'Reilly2015-08-20
| | | | | | | | | | | | | | | | Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
| | * | Remove ez_setup.py from Makefile.amGravatar Dan O'Reilly2015-08-20
| | | | | | | | | | | | | | | | Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
| | * | Use tox in travis build. Tweak tox.iniGravatar Dan O'Reilly2015-08-20
| | | | | | | | | | | | | | | | Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
| | * | Merge branch 'py2_py3_straddle' of github.com:dano/protobuf into ↵Gravatar Dan O'Reilly2015-08-20
| | |\ \ | | | | | | | | | | | | | | | py2_py3_straddle
| | * | | Add some clarifying comments. Remove ez_setup.py.Gravatar Dan O'Reilly2015-08-20
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
| | | * | Fix duplicate entry in .gitignoreGravatar Dan O'Reilly2015-08-18
| | |/ / | | | | | | | | | | | | Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
| | * | Make testing cpp implementation optionalGravatar Dan O'Reilly2015-08-16
| | | | | | | | | | | | | | | | Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
| | * | Fix --cpp_implementation test failure. Test both pure Python and cpp ↵Gravatar Dan O'Reilly2015-08-15
| | | | | | | | | | | | | | | | | | | | | | | | implementation in tox. Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
| | * | Just always uses BytseIO in text_format for nowGravatar Dan O'Reilly2015-08-14
| | | | | | | | | | | | | | | | Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
| | * | Merge remote-tracking branch 'upstream/master' into py2_py3_straddleGravatar Dan O'Reilly2015-08-14
| | |\ \ | |_|/ / |/| | |
| | * | Disable py3* in toxGravatar Dan O'Reilly2015-08-14
| | | | | | | | | | | | | | | | Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
| | * | Get Python 2.6 working.Gravatar Dan O'Reilly2015-08-14
| | | | | | | | | | | | | | | | Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
* | | | Merge pull request #720 from jtattermusch/csharp_fixesGravatar Jon Skeet2015-08-14
|\ \ \ \ | | | | | | | | | | C# fix for TypeInitializer exception.
| * | | | fix type initialization problem with FileDescriptorGravatar Jan Tattermusch2015-08-14
| | | | |
| * | | | add a failing descriptor testGravatar Jan Tattermusch2015-08-14
| | | | |
| * | | | remove duplicate test caseGravatar Jan Tattermusch2015-08-14
| | | | |
| | | * | Fix usage of assertItemsEqual on Py3Gravatar Dan O'Reilly2015-08-14
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
| | | * | Fix some more Python 3 compat issuesGravatar Dan O'Reilly2015-08-14
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-02 07:16:00 +0000