aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #794 from jskeet/anyJan Tattermusch2015-09-046-0/+151
|\ | | | | Pack/Unpack implementation for Any.
| * Pack/Unpack implementation for Any.Jon Skeet2015-09-046-0/+151
|/ | | | | We still need the JSON representation, which relies on something like a DescriptorPool to fetch message types from based on the type URL. That will come a bit later. (The DescriptorPool comment in this commit is just a note which will prove useful if we use DescriptorPool itself.)
* Merge pull request #772 from dano/fix_scalar_mapJoshua Haberman2015-09-047-85/+167
|\ | | | | Fix Python 3.4 cpp implementation
| * Fix Python 3.4 cpp implementationDan O'Reilly2015-08-317-85/+167
| | | | | | | | | | | | | | | | | | | | Fixes the ScalarMapContainer/MessageMapContainer implementations on Python 3.4, by dynamically allocating their PyTypeObjects using PyType_FromSpecWithBases, instead of statically allocating them. This is necessary because Python 3.4+ disallows statically allocating a class with a dynamically allocated parent. Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
* | Merge pull request #793 from kbinani/fix_redefinition_BYTE_SIZE_macroFeng Xiao2015-09-031-12/+12
|\ \ | |/ |/| Rename 'BYTE_SIZE' macro to 'GOOGLE_PROTOBUF_BYTE_SIZE'
| * Rename 'BYTE_SIZE' macro to 'GOOGLE_PROTOBUF_BYTE_SIZE'kbinani2015-09-041-12/+12
|/ | | | | | Xcode raises warning that says "'BYTE_SIZE' macro redefined". The original 'BYTE_SIZE' macro definition is here, for example: '/Applications/Xcode/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.10.sdk/usr/include/mach/vm_param.h'
* Merge remote-tracking branch 'origin/master' into beta-1Feng Xiao2015-08-299-96/+109
|\ | | | | | | | | Conflicts: src/google/protobuf/extension_set.h
| * Merge pull request #770 from pkasting/string_spaceFeng Xiao2015-08-284-19/+14
| |\ | | | | | | Move StringSpaceUsedIncludingSelf to lite library.
| | * Move StringSpaceUsedIncludingSelf to lite library.Peter Kasting2015-08-274-19/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | This came up because Chromium downstream modifies the lite library in a way that requires this function, but I'm upstreaming it because based on the comments in repeated_field.h, this ought to allow resolution of an existing hack. I don't know enough about the protobuf code to feel confident trying to resolve this hack myself, so I've merely updated the TODO comments.
| * | Merge pull request #771 from pkasting/static_init_1Feng Xiao2015-08-282-63/+78
| |\ \ | | | | | | | | Remove a static initializer by removing a global of non-POD type.
| | * | Remove a static initializer by removing a global of non-POD type.Peter Kasting2015-08-272-63/+78
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These are banned by the Google style guide, and Chromium has a hard no-new-static-initializers policy preventing updating to a new version of libprotobuf unless this is resolved. This is the first such change, I'll need to make at least one more in the future. Luckily, the protobuf source tree already has an alternative to static initializers in once.h; use that machinery instead. I defined everything in the .cc file in a blob to replace the old implementation rather than matching the .h layout precisely; let me know if a different ordering is preferred. I also eliminated the macro that used to be used here as spelling everything out only takes one additional line, and the macro didn't actually handle all details of using a particular member variable, just the declaration, so it felt a bit error-prone.
| * | | Merge pull request #569 from redivo/masterFeng Xiao2015-08-281-5/+5
| |\ \ \ | | | | | | | | | | Fix GOOGLE_PROTOBUF_ATOMICOPS_ERROR syntax error
| | * | | Fix GOOGLE_PROTOBUF_ATOMICOPS_ERROR syntax errorGeorge Redivo2015-07-061-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's not possible to define "#error" inside a define. It causes 'error: stray ‘#’ in program' compilation error. Now the define GOOGLE_PROTOBUF_ATOMICOPS_ERROR is the error message and it's used along the code together "#error".
| * | | | Merge pull request #768 from pkasting/timeFeng Xiao2015-08-281-1/+0
| |\ \ \ \ | | |_|/ / | |/| | | Delete kNanosPerSecond from time.cc.
| | * | | Delete kNanosPerSecond from time.cc.Peter Kasting2015-08-271-1/+0
| | | |/ | | |/| | | | | | | | | This variable is unused, and thus triggers a build warning on MSVC.
| * | | Merge pull request #746 from zmodem/fix_predict_macros2Feng Xiao2015-08-271-2/+2
| |\ \ \ | | | | | | | | | | Fix the no-op definitions of GOOGLE_PREDICT_{TRUE,FALSE}
| | * | | Fix the no-op definitions of GOOGLE_PREDICT_{TRUE,FALSE}Hans Wennborg2015-08-261-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 #767 from pkasting/portFeng Xiao2015-08-271-6/+10
| |\ \ \ \ | | |_|/ / | |/| | | Avoid #including system headers from inside a namespace.
| | * | | Avoid #including system headers from inside a namespace.Peter Kasting2015-08-271-6/+10
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 #776 from haberman/pyfixJoshua Haberman2015-08-291-15/+18
|\ \ \ \ | | | | | | | | | | Fix for https://github.com/google/protobuf/issues/758
| * | | | Fixed assignment syntax error.Josh Haberman2015-08-281-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: Ifef8a300258214aae8f6b8516fbc61b7335b5724
| * | | | Fix for https://github.com/google/protobuf/issues/758Josh Haberman2015-08-281-14/+17
|/ / / / | | | | | | | | | | | | Change-Id: I590b34b96c84a3ba6e094a0bd86f153147ade3d3
* | | | Merge pull request #765 from xfxyjwf/javadocFeng Xiao2015-08-274-24/+25
|\ \ \ \ | | | | | | | | | | Fix javadoc errors.
| * | | | Fix javadoc errors.Feng Xiao2015-08-274-24/+25
|/ / / /
* | | | Merge pull request #759 from TeBoring/beta-1-2v3.0.0-beta-1v3.0.0-alpha-4Feng Xiao2015-08-271-5/+19
|\ \ \ \ | | | | | | | | | | Fix Protobuf.podspec
| * | | | Fix Protobuf.podspecTeBoring2015-08-261-5/+19
| | | | |
* | | | | Merge pull request #757 from xfxyjwf/python_failureJisi Liu2015-08-261-0/+7
|\ \ \ \ \ | | | | | | | | | | | | Excludes a failing python cpp test case.
| * | | | | Excludes a failing python cpp test case.Feng Xiao2015-08-261-0/+7
|/ / / / /
* | | | | Make jruby use Java 3.0.0-alpha-3.Feng Xiao2015-08-261-1/+1
| | | | |
* | | | | Update generated file.Feng Xiao2015-08-261-1/+0
| | | | |
* | | | | Fix merge conflict.Feng Xiao2015-08-261-1/+0
| | | | |
* | | | | Merge pull request #756 from TeBoring/beta-1Feng Xiao2015-08-261-0/+1
|\ \ \ \ \ | | | | | | | | | | | | Add distribution for objc
| * | | | | Add distribution for objcBo Yang2015-08-261-0/+2
| | | | | |
* | | | | | Update Makefile.am to include missing files.Feng Xiao2015-08-261-11/+45
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Add missing files in dist.Feng Xiao2015-08-261-1/+21
| | |/ / / | |/| | |
* | | | | Merge pull request #755 from pherl/beta-1Jisi Liu2015-08-261-0/+3
|\ \ \ \ \ | | | | | | | | | | | | Add bazel build/workspace into distribution.
| * | | | | Add bazel build/workspace into distribution.Jisi Liu2015-08-261-0/+3
|/ / / / / | | | | | | | | | | | | | | | Change-Id: I96fbe5c84a04f5d95c5484002404fc975f2abd21
* | | | | Merge pull request #754 from xfxyjwf/changelogFeng Xiao2015-08-261-0/+106
|\ \ \ \ \ | |_|/ / / |/| | | | Update change log for beta-1.
| * | | | Update change log for beta-1.Feng Xiao2015-08-261-0/+106
| | | | |
* | | | | Merge pull request #750 from TeBoring/beta-1Paul Yang2015-08-2616-29/+457
|\ \ \ \ \ | |/ / / / |/| | | | Fix bugs for objectivec
| * | | | Fix bugs for objectivecTeBoring2015-08-2616-29/+457
| | | | |
* | | | | Merge branch 'master' of github.com:google/protobuf into beta-1Feng Xiao2015-08-263-11/+27
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge pull request #728 from dano/py3_str_compatJoshua Haberman2015-08-263-11/+27
| |\ \ \ \ | | | | | | | | | | | | Get all tests passing on Python3 (except Python3.4 cpp implementation)
| | * | | | Fix metaclass issue on Python 3. Get text handling tests passing on Python 3.Dan O'Reilly2015-08-223-13/+9
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
| | * | | | Start work on getting text handled properly on PY3Dan O'Reilly2015-08-221-7/+27
| | | | | |
* | | | | | Update post_process_dist.shFeng Xiao2015-08-261-5/+1
| | | | | | | | | | | | | | | | | | | | | | | | vsproject files no longer exist.
* | | | | | Merge pull request #751 from xfxyjwf/version_numberFeng Xiao2015-08-2610-14/+14
|\ \ \ \ \ \ | | | | | | | | | | | | | | Update version number.
| * | | | | | 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.
* | | | | | | Merge pull request #752 from google/jtattermusch-patch-1Feng Xiao2015-08-261-7/+12
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Update README.md for C#
| * | | | | | | Update README.md for C#Jan Tattermusch2015-08-261-7/+12
|/ / / / / / /
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-20 02:43:50 +0000