aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Adding back three missing export macros.Jisi Liu2015-10-051-3/+3
|
* Merge remote-tracking branch 'origin/master' into fix-authorJisi Liu2015-10-0586-2090/+4997
|\
| * Merge pull request #845 from jskeet/xmldocsJan Tattermusch2015-10-0532-1/+2123
| |\ | | | | | | Extract XML documentation in a primitive but reasonably-effective way
| | * Generated code from previous commit.Jon Skeet2015-10-0119-0/+1945
| | |
| | * First pass at generating XML documentation from .proto comments.Jon Skeet2015-10-0113-1/+178
| | | | | | | | | | | | | | | | | | This could be tidied up significantly, and at some point we will want to parse the markdown and generate more appropriate XML - but this is definitely better than nothing. Generated code changes coming in next commit.
| * | Merge pull request #843 from thomasvl/objcpp_enum_fwd_declPaul Yang2015-10-015-6/+92
| |\ \ | | | | | | | | Support enum forward decls in Objective C++
| | * | Support enum forward decls in Objective C++Thomas Van Lenten2015-10-015-6/+92
| |/ / | | | | | | | | | | | | | | | NS_ENUM changes defintion in Objective C++ based on the C++ spec being compiled with, special case the one situation where it wouldn't support doing a forward decl for the enum.
| * | Merge pull request #841 from thomasvl/newer_xcodesPaul Yang2015-09-3015-1208/+1216
| |\ \ | | |/ | |/| Cleanups for newer Xcodes
| | * Cleanups for newer XcodesThomas Van Lenten2015-09-2915-1208/+1216
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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 #834 from jskeet/docfixesJon Skeet2015-09-3023-5/+75
| |\ \ | | | | | | | | Add (some) XML documentation to generated code
| | * | Fix typo in oneof case enum commentJon Skeet2015-09-306-10/+10
| | | |
| | * | Generated code changes for previous commit.Jon Skeet2015-09-2919-34/+34
| | | |
| | * | Move the summary comments above the attributes.Jon Skeet2015-09-292-9/+9
| | | | | | | | | | | | | | | | (Generated code changes coming next...)
| | * | Generated code for previous commitJon Skeet2015-09-2919-0/+62
| | | |
| | * | Added documentation to generated code.Jon Skeet2015-09-294-3/+11
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | Merge pull request #836 from jcanizales/fix-version-numberPaul Yang2015-09-291-1/+1
| |\ \ | | | | | | | | Fix Podspec version number
| | * | Fix Podspec version numberJorge Canizales2015-09-291-1/+1
| | |/ | | | | | | This was released as `3.0.0-alpha-4.1`
| * | Merge pull request #831 from haberman/ruby-tinyfixJoshua Haberman2015-09-292-2/+7
| |\ \ | | |/ | |/| A very small fix to silence some warnings.
| | * A very small fix to silence some warnings.Josh Haberman2015-09-282-2/+7
| |/ | | | | | | | | | | | | Also updated the Gemfile.lock since alpha-4 has been pushed to RubyGems. Change-Id: I8ddc5f125f28aa9a33c88dfe48251a75a877e1d3
| * Merge pull request #727 from AustinSchuh/arena_bounds_fixFeng Xiao2015-09-241-0/+3
| |\ | | | | | | Handled blocks being too small in arena.cc
| | * Handled blocks being too small in arena.ccAustin Schuh2015-08-281-0/+3
| | | | | | | | | | | | | | | | | | 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 #785 from jskeet/csharp-directoriesJan Tattermusch2015-09-2326-762/+1095
| |\ \ | | | | | | | | Generate C# directory hierarchy with new option
| | * | Regenerated code. Most changes are whitespace, removing trailing spaces.Jon Skeet2015-09-0119-741/+1033
| | | | | | | | | | | | | | | | 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.Jon Skeet2015-09-011-1/+1
| | | |
| | * | Specify csharp_namespace in descriptor.protoJon Skeet2015-09-012-4/+3
| | | |
| | * | Generate a directory hierarchy based on namespace (C#)Jon Skeet2015-09-013-14/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 MakeFixedTagJon Skeet2015-09-011-2/+0
| | | |
| * | | Merge pull request #813 from 0xAAE/masterFeng Xiao2015-09-161-0/+8
| |\ \ \ | | | | | | | | | | Add GOOGLE_ATTRIBUTE_NOINLINE to GetArena() and GetMaybeArenaPointer(…
| | * | | Add GOOGLE_ATTRIBUTE_NOINLINE to GetArena() and GetMaybeArenaPointer() ↵0xAAE2015-09-151-0/+8
| |/ / / | | | | | | | | | | | | methods. This is to avoid "unresolved link" errors in MSVC 2015 during Release build
| * | | Merge pull request #769 from pkasting/metadataFeng Xiao2015-09-101-1/+1
| |\ \ \ | | | | | | | | | | Fix compile failures building protobuf DLLs on MSVC in Chromium's cod…
| | * | | Change to just not marking the class for exportPeter Kasting2015-08-275-47/+3
| | | | |
| | * | | Fix compile failures building protobuf DLLs on MSVC in Chromium's codebase.Peter Kasting2015-08-275-2/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When trying to compile the protobuf code as a DLL, and then compile other DLLs with generated .pb.cc/h files that reference InternalMetadataWithArena::InternalMetadataWithArena(Arena*), MSVC gives an "unresolved external symbol" error. This seems to be due to the function being simultaneously exported and inline. Moving it out-of-line fixes things. There are other functions exported and inline as well but de-inlining them doesn't seem to be necessary to get the build working, and I'd rather de-inline as few functions as possible.
| * | | | Merge pull request #766 from pkasting/hashFeng Xiao2015-09-101-4/+4
| |\ \ \ \ | | | | | | | | | | | | Refine check for unordered_{map|set} availability.
| | * | | | It helps if you write macros correctlyPeter Kasting2015-08-271-2/+2
| | | | | |
| | * | | | Try modifying check in hopes of passing upstream buildPeter Kasting2015-08-271-2/+3
| | | | | |
| | * | | | Review commentsPeter Kasting2015-08-271-2/+1
| | | | | |
| | * | | | Refine check for unordered_{map|set} availability.Peter Kasting2015-08-271-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 #802 from bsilver8192/masterFeng Xiao2015-09-082-1/+13
| |\ \ \ \ \ | | | | | | | | | | | | | | Small fixes
| | * | | | | Don't assume char is signed.Brian Silverman2015-09-081-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.Brian Silverman2015-09-081-0/+7
| |/ / / / / | | | | | | | | | | | | | | | | | | Bazel expects all tests to do this.
| * | | | | Merge pull request #786 from pherl/masterJisi Liu2015-09-081-0/+5
| |\ \ \ \ \ | | | | | | | | | | | | | | Update objc script in generate_descriptor_proto.sh
| | * | | | | Update objc script in generate_descriptor_proto.shJisi Liu2015-09-081-0/+5
| | | |_|/ / | | |/| | |
| * | | | | Merge pull request #796 from jcanizales/add-missing-commaPaul Yang2015-09-041-1/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | Fix podspec by adding missing comma
| | * | | | | Fix podspec by adding missing commaJorge Canizales2015-09-041-1/+1
| |/ / / / /
| * | | | | 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'
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-31 13:33:03 +0000