aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
Commit message (Collapse)AuthorAge
* Merge pull request #783 from podsvirov/topic-cmake-projectGravatar Feng Xiao2015-10-16
|\ | | | | Improved CMake project
* \ Merge pull request #824 from jtattermusch/expose_get_output_fileGravatar Jan Tattermusch2015-10-14
|\ \ | | | | | | Expose GetOutputFile in csharp_names.h
* \ \ Merge pull request #875 from tkarls/return_correct_bool_type_from_mapGravatar Feng Xiao2015-10-13
|\ \ \ | | | | | | | | Changed return type from int32 to bool in function returning a bool
* | | | Changed argument typ to uint32 in set function that sets an uint32 valueGravatar Thomas Karlsson2015-10-13
| | | |
| * | | Changed return type from int32 to bool in function returning a boolGravatar Thomas Karlsson2015-10-13
|/ / /
* | | Merge pull request #815 from TeBoring/third-partyGravatar Paul Yang2015-10-09
|\ \ \ | | | | | | | | Use std::get where it's available
* | | | Use static castGravatar Hamdi Sahloul2015-10-09
| | | | | | | | | | | | Used static cast to improve initalization compatibility with MSVC2010
* | | | VS2010 compatibility of address initalizationGravatar Hamdi Sahloul2015-10-09
| | | | | | | | | | | | VS2010 cannot compile json_util_test.cc since it assumes NULL as a zero (int), and therefore cannot convert into to char*
* | | | Remove duplicated header fileGravatar Jisi Liu2015-10-06
| | | |
* | | | fix stringpiece test to use portable hash set.Gravatar Jisi Liu2015-10-05
| | | |
* | | | Adding back three missing export macros.Gravatar Jisi Liu2015-10-05
| | | |
* | | | Merge remote-tracking branch 'origin/master' into fix-authorGravatar Jisi Liu2015-10-05
|\ \ \ \
* | | | | Down-integrate from google internal.Gravatar Jisi Liu2015-10-05
| | | | |
| | * | | Down-integrate internal bug fixing changes.Gravatar Bo Yang2015-10-04
| | | | |
| * | | | First pass at generating XML documentation from .proto comments.Gravatar Jon Skeet2015-10-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | Fix typo in oneof case enum commentGravatar Jon Skeet2015-09-30
| | | | |
| * | | | Move the summary comments above the attributes.Gravatar Jon Skeet2015-09-29
| | | | | | | | | | | | | | | | | | | | (Generated code changes coming next...)
| * | | | 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.
| * | | | Merge pull request #727 from AustinSchuh/arena_bounds_fixGravatar Feng Xiao2015-09-24
| |\ \ \ \ | | | | | | | | | | | | Handled blocks being too small in arena.cc
| | | | * | expose GetOutputFile in csharp_names.hGravatar Jan Tattermusch2015-09-23
| | |_|/ / | |/| | |
| * | | | Merge pull request #785 from jskeet/csharp-directoriesGravatar Jan Tattermusch2015-09-23
| |\ \ \ \ | | | | | | | | | | | | Generate C# directory hierarchy with new option
| | | | | * Simplify testing from CMake project to "check" targetGravatar Konstantin Podsvirov2015-09-17
| | | | | |
| | | | | * Improved testing from CMake projectGravatar Konstantin Podsvirov2015-09-15
| |_|_|_|/ |/| | | |
| * | | | 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.
| * | | | | 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.
| * | | | | 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'
| | | * | 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
| |_|/ / |/| | |
* | | | Merge remote-tracking branch 'origin/master' into beta-1Gravatar Feng Xiao2015-08-29
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: src/google/protobuf/extension_set.h
| * \ \ \ 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}.
| * | | | | Merge pull request #746 from zmodem/fix_predict_macros2Gravatar Feng Xiao2015-08-27
| |\ \ \ \ \ | | | | | | | | | | | | | | Fix the no-op definitions of GOOGLE_PREDICT_{TRUE,FALSE}
| | | | | | * Change to just not marking the class for exportGravatar Peter Kasting2015-08-27
| | | | | | |
| | | | | * | 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.
| | | | | | * Fix compile failures building protobuf DLLs on MSVC in Chromium's codebase.Gravatar Peter Kasting2015-08-27
| | | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| | | * | / 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.
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-20 19:37:48 +0000