aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAge
* Merge pull request #841 from thomasvl/newer_xcodesGravatar Paul Yang2015-09-30
|\ | | | | Cleanups for newer Xcodes
* \ Merge pull request #834 from jskeet/docfixesGravatar Jon Skeet2015-09-30
|\ \ | | | | | | Add (some) XML documentation to generated code
| * | Fix typo in oneof case enum commentGravatar Jon Skeet2015-09-30
| | |
* | | Merge pull request #836 from jcanizales/fix-version-numberGravatar Paul Yang2015-09-29
|\ \ \ | | | | | | | | Fix Podspec version number
| | | * Cleanups for newer XcodesGravatar Thomas Van Lenten2015-09-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Move up to 8.4 as the high simulator (assuming Xcode 6.4). - Add cast to NSMutableDictionary so clang and resolve the selector. - Add case for the newer static analyzer so it won't trigger a false warning. - Update the "dictionary" interface to use "object" naming. Xcode 7+ has gotten more strict on the use of nonnull/nullable; combining that with the generic collection support; and the "dictionary" classes we created now collide with what the generic KeyValueCoding in the system headers triggering warnings/errors. Fix this and hopefully all future issue by renaming the methods to use "object" for the classes that have data types as objects instead of PODs. Taking this renaming hit now while ObjC is still in beta because it is a breaking change for any existing code.
* | | | Merge pull request #831 from haberman/ruby-tinyfixGravatar Joshua Haberman2015-09-29
|\ \ \ \ | |_|_|/ |/| | | A very small fix to silence some warnings.
| | * | Fix Podspec version numberGravatar Jorge Canizales2015-09-29
| |/ / |/| | | | | This was released as `3.0.0-alpha-4.1`
| | * Generated code changes for previous commit.Gravatar Jon Skeet2015-09-29
| | |
| | * Move the summary comments above the attributes.Gravatar Jon Skeet2015-09-29
| | | | | | | | | | | | (Generated code changes coming next...)
| | * Generated code for previous commitGravatar Jon Skeet2015-09-29
| | |
| | * Added documentation to generated code.Gravatar Jon Skeet2015-09-29
| |/ |/| | | | | | | | | | | | | | | | | | | There are now summaries for: - The Types nested class (which holds nested types) - The file descriptor class for each proto - The enum generated for each oneof (Also fixed two typos.) Generated code in next commit.
| * A very small fix to silence some warnings.Gravatar Josh Haberman2015-09-28
|/ | | | | | | Also updated the Gemfile.lock since alpha-4 has been pushed to RubyGems. Change-Id: I8ddc5f125f28aa9a33c88dfe48251a75a877e1d3
* Merge pull request #727 from AustinSchuh/arena_bounds_fixGravatar Feng Xiao2015-09-24
|\ | | | | Handled blocks being too small in arena.cc
* \ Merge pull request #785 from jskeet/csharp-directoriesGravatar Jan Tattermusch2015-09-23
|\ \ | | | | | | Generate C# directory hierarchy with new option
* \ \ Merge pull request #813 from 0xAAE/masterGravatar Feng Xiao2015-09-16
|\ \ \ | | | | | | | | Add GOOGLE_ATTRIBUTE_NOINLINE to GetArena() and GetMaybeArenaPointer(…
| * | | Add GOOGLE_ATTRIBUTE_NOINLINE to GetArena() and GetMaybeArenaPointer() ↵Gravatar 0xAAE2015-09-15
|/ / / | | | | | | | | | methods. This is to avoid "unresolved link" errors in MSVC 2015 during Release build
* | | Merge pull request #769 from pkasting/metadataGravatar Feng Xiao2015-09-10
|\ \ \ | | | | | | | | Fix compile failures building protobuf DLLs on MSVC in Chromium's cod…
* \ \ \ 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'
| | | | * | Regenerated code. Most changes are whitespace, removing trailing spaces.Gravatar Jon Skeet2015-09-01
| | | | | | | | | | | | | | | | | | | | | | | | Other changes are due to the well-known types changing without us regenerating.
| | | | * | Stop adding a space to the end of lines for descriptor binary data.Gravatar Jon Skeet2015-09-01
| | | | | |
| | | | * | Specify csharp_namespace in descriptor.protoGravatar Jon Skeet2015-09-01
| | | | | |
| | | | * | Generate a directory hierarchy based on namespace (C#)Gravatar Jon Skeet2015-09-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This introduces a new C# option, base_namespace. If the option is not specified, the behaviour is as before: no directories are generated. If the option *is* specified, all C# namespaces must be relative to the base namespace, and the directories are generated relative to that namespace. Example: - Any.proto declares csharp_namespace = "Google.Protobuf.WellKnownTypes" - We build with --csharp_out=Google.Protobuf --csharp_opt=base_namespace=Google.Protobuf - The Any.cs file is generated in Google.Protobuf/WellKnownTypes (where it currently lives) We need a change to descriptor.proto before this will all work (it wasn't in the right C# namespace) but that needs the other descriptors to be regenerated too. See next commit...
| | | | * | Remove vestigial reference to MakeFixedTagGravatar Jon Skeet2015-09-01
| |_|_|/ / |/| | | |
| * | | | 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
| | | | | | | * Handled blocks being too small in arena.ccGravatar Austin Schuh2015-08-28
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the user passed in a block which was smaller than the Block structure, this code would blow past the end of the memory and crash. Check for that condition.
| * | | | | | 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}.
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-30 19:43:16 +0000