aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAge
* Merge pull request #766 from pkasting/hashGravatar Feng Xiao2015-09-10
|\ | | | | Refine check for unordered_{map|set} availability.
* \ Merge pull request #802 from bsilver8192/masterGravatar Feng Xiao2015-09-08
|\ \ | | | | | | Small fixes
| * | Don't assume char is signed.Gravatar Brian Silverman2015-09-08
| | | | | | | | | | | | | | | It isn't always, which causes problems when trying to put negative values into the array with C++11.
| * | Use TEST_TMPDIR for writing temporary files if it's set.Gravatar Brian Silverman2015-09-08
|/ / | | | | | | Bazel expects all tests to do this.
* | Merge pull request #786 from pherl/masterGravatar Jisi Liu2015-09-08
|\ \ | | | | | | Update objc script in generate_descriptor_proto.sh
| * | Update objc script in generate_descriptor_proto.shGravatar Jisi Liu2015-09-08
| | |
* | | Merge pull request #796 from jcanizales/add-missing-commaGravatar Paul Yang2015-09-04
|\ \ \ | | | | | | | | Fix podspec by adding missing comma
| * | | Fix podspec by adding missing commaGravatar Jorge Canizales2015-09-04
|/ / /
* | | Merge pull request #794 from jskeet/anyGravatar Jan Tattermusch2015-09-04
|\ \ \ | | | | | | | | Pack/Unpack implementation for Any.
| * | | Pack/Unpack implementation for Any.Gravatar Jon Skeet2015-09-04
|/ / / | | | | | | | | | | | | 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_mapGravatar Joshua Haberman2015-09-04
|\ \ \ | | | | | | | | Fix Python 3.4 cpp implementation
* \ \ \ Merge pull request #793 from kbinani/fix_redefinition_BYTE_SIZE_macroGravatar Feng Xiao2015-09-03
|\ \ \ \ | |_|/ / |/| | | Rename 'BYTE_SIZE' macro to 'GOOGLE_PROTOBUF_BYTE_SIZE'
| * | | Rename 'BYTE_SIZE' macro to 'GOOGLE_PROTOBUF_BYTE_SIZE'Gravatar kbinani2015-09-04
|/ / / | | | | | | | | | | | | | | | 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'
| * / Fix Python 3.4 cpp implementationGravatar Dan O'Reilly2015-08-31
|/ / | | | | | | | | | | | | | | | | | | 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 remote-tracking branch 'origin/master' into beta-1Gravatar Feng Xiao2015-08-29
|\ \ | | | | | | | | | | | | Conflicts: src/google/protobuf/extension_set.h
* \ \ Merge pull request #776 from haberman/pyfixGravatar Joshua Haberman2015-08-29
|\ \ \ | | | | | | | | Fix for https://github.com/google/protobuf/issues/758
| * | | Fixed assignment syntax error.Gravatar Josh Haberman2015-08-28
| | | | | | | | | | | | | | | | Change-Id: Ifef8a300258214aae8f6b8516fbc61b7335b5724
| * | | Fix for https://github.com/google/protobuf/issues/758Gravatar Josh Haberman2015-08-28
|/ / / | | | | | | | | | Change-Id: I590b34b96c84a3ba6e094a0bd86f153147ade3d3
| * | Merge pull request #770 from pkasting/string_spaceGravatar Feng Xiao2015-08-28
| |\ \ | | | | | | | | Move StringSpaceUsedIncludingSelf to lite library.
| * \ \ Merge pull request #771 from pkasting/static_init_1Gravatar Feng Xiao2015-08-28
| |\ \ \ | | | | | | | | | | Remove a static initializer by removing a global of non-POD type.
| * \ \ \ Merge pull request #569 from redivo/masterGravatar Feng Xiao2015-08-28
| |\ \ \ \ | | | | | | | | | | | | Fix GOOGLE_PROTOBUF_ATOMICOPS_ERROR syntax error
| * \ \ \ \ Merge pull request #768 from pkasting/timeGravatar Feng Xiao2015-08-28
| |\ \ \ \ \ | | | | | | | | | | | | | | Delete kNanosPerSecond from time.cc.
| | | | * | | Remove a static initializer by removing a global of non-POD type.Gravatar Peter Kasting2015-08-27
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| | | | | * 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.
| | | | | | * Move StringSpaceUsedIncludingSelf to lite library.Gravatar Peter Kasting2015-08-27
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 #765 from xfxyjwf/javadocGravatar Feng Xiao2015-08-27
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix javadoc errors.
| | | | | * | Delete kNanosPerSecond from time.cc.Gravatar Peter Kasting2015-08-27
| | | |_|/ / | | |/| | | | | | | | | | | | | | | This variable is unused, and thus triggers a build warning on MSVC.
| | | * | | 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.
| * / / / Fix javadoc errors.Gravatar Feng Xiao2015-08-27
|/ / / /
* | | | Merge pull request #759 from TeBoring/beta-1-2Gravatar Feng Xiao2015-08-27
|\ \ \ \ | | | | | | | | | | Fix Protobuf.podspec
| * | | | Fix Protobuf.podspecGravatar TeBoring2015-08-26
| | | | |
* | | | | Merge pull request #757 from xfxyjwf/python_failureGravatar Jisi Liu2015-08-26
|\ \ \ \ \ | | | | | | | | | | | | Excludes a failing python cpp test case.
| * | | | | Excludes a failing python cpp test case.Gravatar Feng Xiao2015-08-26
|/ / / / /
* | | | | Make jruby use Java 3.0.0-alpha-3.Gravatar Feng Xiao2015-08-26
| | | | |
* | | | | Update generated file.Gravatar Feng Xiao2015-08-26
| | | | |
* | | | | Fix merge conflict.Gravatar Feng Xiao2015-08-26
| | | | |
* | | | | Merge pull request #756 from TeBoring/beta-1Gravatar Feng Xiao2015-08-26
|\ \ \ \ \ | | | | | | | | | | | | Add distribution for objc
* \ \ \ \ \ Update Makefile.am to include missing files.Gravatar Feng Xiao2015-08-26
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Add missing files in dist.Gravatar Feng Xiao2015-08-26
| | |/ / / | |/| | |
| | * | | Add distribution for objcGravatar Bo Yang2015-08-26
| | | | |
* | | | | Merge pull request #755 from pherl/beta-1Gravatar Jisi Liu2015-08-26
|\ \ \ \ \ | | | | | | | | | | | | Add bazel build/workspace into distribution.
| * | | | | Add bazel build/workspace into distribution.Gravatar Jisi Liu2015-08-26
|/ / / / / | | | | | | | | | | | | | | | Change-Id: I96fbe5c84a04f5d95c5484002404fc975f2abd21
* | | | | Merge pull request #754 from xfxyjwf/changelogGravatar Feng Xiao2015-08-26
|\ \ \ \ \ | |_|/ / / |/| | | | Update change log for beta-1.
| * | | | Update change log for beta-1.Gravatar Feng Xiao2015-08-26
| | | | |
* | | | | Merge pull request #750 from TeBoring/beta-1Gravatar Paul Yang2015-08-26
|\ \ \ \ \ | |/ / / / |/| | | | Fix bugs for objectivec
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-02 04:14:24 +0000