aboutsummaryrefslogtreecommitdiff
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
...
| * | Add missing golden test file.Feng Xiao2016-07-141-0/+1
| | |
| * | Add missing LIBPROTOBUF_EXPORTFeng Xiao2016-07-131-4/+4
| | |
| * | Add missing LIBPROTOBUF_EXPORT.Feng Xiao2016-07-131-3/+4
| | |
| * | Update generated files.Feng Xiao2016-07-1312-256/+457
| | |
| * | Integrate from internal code base.Feng Xiao2016-07-1336-213/+719
| | |
* | | Use public methods to fetch oneofs in generated code.Thomas Van Lenten2016-07-181-1/+1
|/ / | | | | | | | | | | | | | | When building into frameworks, the generated code doesn't always have direct access to the proto internals. Instead of opening up the access, just use the public method to fetch the correct oneof. Fixes https://github.com/google/protobuf/issues/1789
* | Merge pull request #1735 from jskeet/attribute-placementJon Skeet2016-07-0713-41/+64
|\ \ | | | | | | Change placement of DebuggerNonUserCodeAttribute
| * | Remove WriteGeneratedTypeAttributes which is a no-opJon Skeet2016-07-075-13/+2
| | | | | | | | | | | | | | | | | | This does not affect the generated code. If we decide we want to apply attributes to generated types, we should start by just reverting this change.
| * | Move DebuggerNonUserCodeAttribute to function membersJon Skeet2016-07-0413-39/+73
| | | | | | | | | | | | | | | | | | | | | | | | | | | I think this has caught everything. I've left a stub for attributes to be applied to the types themselves, but we don't currently need anything. Follow-up commit will include the changes to generated code itself. Fixes #1671.
* | | Make sure also Solaris x86 gets PATH_MAXDagobert Michelsen2016-07-071-2/+0
| | |
* | | Merge pull request #1753 from xfxyjwf/fixupJisi Liu2016-07-072-10/+2
|\ \ \ | | | | | | | | Fix problems detected when integrating the code to our internal repo.
| * | | Fix data member declaration order.Feng Xiao2016-07-061-2/+2
| | | |
| * | | Don't support global ::string in stringpiece.hFeng Xiao2016-07-061-8/+0
| |/ /
* | | Fix spelling error in function ParseTime parameterOtto Kekäläinen2016-07-031-1/+1
| | |
* | | Fix spelling in strings and commentsOtto Kekäläinen2016-07-0325-26/+26
|/ /
* | Merge pull request #1704 from lizan/json_parse_optionsFeng Xiao2016-07-018-32/+214
|\ \ | | | | | | Add JsonParseOptions to ignore unknown fields
| * | Add JsonParseOptions to ignore unknown fieldsLizan Zhou2016-06-288-32/+214
| | | | | | | | | | | | | | | - add JsonParseOptions for JsonToBinaryString allow unknown fields - rename current JsonOptions to JsonPrintOptions
* | | Fix some failing travis tests.Feng Xiao2016-07-011-0/+1
| | | | | | | | | | | | | | | | | | | | | 1. Add missing header file to Makefile.am. 2. Re-generate objectivec generated code for well-known types. Change-Id: If28217c701cf8bd739ea0db240e9eee600f23ee7
* | | Fix windows build.Feng Xiao2016-06-302-7/+14
| | | | | | | | | | | | Change-Id: Ibf7d1df850f4b497303f9f617751be98327898ef
* | | Integrated internal changes from GoogleAdam Cozzette2016-06-29128-1318/+4351
|/ / | | | | | | This includes all internal changes from around May 20 to now.
* | Merge pull request #1696 from haberman/jswktJoshua Haberman2016-06-171-3/+11
|\ \ | | | | | | JS: import well-known types from google-protobuf package.
| * | Bugfix: base the require logic on the file being required.Josh Haberman2016-06-161-4/+4
| | |
| * | JS: import well-known types from google-protobuf package.Josh Haberman2016-06-161-0/+8
| | |
* | | Add new generation option for using proto sources from other frameworks.Thomas Van Lenten2016-06-174-127/+325
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Better docs in the generator for the different options that can be passed during an invoke of protoc. - Add named_framework_to_proto_path_mappings_path to pass the path to a file containing mappings of frameworks for different proto files. - Update the generation to use the mapping to change the #import directives it creates. Note: the changes in helpers is mostly moving code within the fine, and then a small change to expose the parsing so a passed on class can consume the line. Fixes https://github.com/google/protobuf/issues/1457
* | | Address review comments on function namevjpai2016-06-161-2/+2
| | |
* | | Remove a friend-class template that is only used for theVijay Pai2016-06-151-4/+7
|/ / | | | | | | | | | | | | constructor, and instead create an _internal_only getter that gets the needed information. This is a workaround for a deficiency in gcc-4.4 that does not properly support templated friend classes.
* | Add support for generation sources into a framework.Thomas Van Lenten2016-06-154-8/+39
| | | | | | | | | | | | | | | | | | | | - Add a protoc objc option (generate_for_named_framework) to set the name of the framework all generated sources will be in. - Tweak some comments/naming to make it clear what is the Protobuf framework vs. the framework for generated code. - Update the objc README to document the new generation option to protoc. This is working towards https://github.com/google/protobuf/issues/1457.
* | proper codeblock in READMEBrent Shaffer2016-06-091-1/+1
| |
* | Merge pull request #879 from mathstuf/support-equals-in-proto-pathFeng Xiao2016-06-082-2/+22
|\ \ | | | | | | protoc: support '=' in --proto_path arguments
| * | protoc: support '=' in --proto_path argumentsBen Boeckel2016-04-202-2/+22
| | |
* | | Add GOOGLE_ prefix before PROTOBUF_DEPRECATED_ATTRBo Yang2016-06-073-3/+3
| | |
* | | Fix the undefined behavior for opensource users.Bo Yang2016-06-071-3/+5
| | |
* | | Add more warnings to for the ObjC runtime buildThomas Van Lenten2016-05-253-2/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Working on https://github.com/google/protobuf/issues/1599, specifically: - Turn on more warnings that the Xcode UI calls out with individual controls. - Manually add: -Wundef -Wswitch-enum - Manually add and then diable in the unittests because of XCTest's headers: -Wreserved-id-macro -Wdocumentation-unknown-command - Manually add -Wdirect-ivar-access, but disable it for the unittests and in the library code (via #pragmas to suppress it). This is done so proto users can enable the warning.
* | | Better support for using the proto library from a framework.Thomas Van Lenten2016-05-244-48/+199
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Add generator constant for the default framework name. - Add generator api for making the CPP symbol from the name. - Add generator api to see if it is a bundled proto file. - Output a CPP conditional and two imports for the core library headers. - Add helper for generating the #import for file headers to deal with the framework imports. - Add a reference from the unittests to a WKT to use that to inspect how imports generate. - Update the podspec to define the CPP symbol and require pods 1.0 (or later). Fixes https://github.com/google/protobuf/issues/1457
* | | Merge pull request #1549 from xyzzyz/arena_exportJoshua Haberman2016-05-181-1/+1
|\ \ \ | | | | | | | | Export class Arena to shared library.
| * | | Export class Arena to shared library.Adam Michalik2016-05-171-1/+1
| | | | | | | | | | | | | | | | | | | | This got broken in commit 6ef984af4b0c63c1c33127a12dcfc8e6359f0c9e which integrated changes from internal branch.
* | | | Merge pull request #1547 from xyzzyz/js_generatorJoshua Haberman2016-05-181-1/+1
|\ \ \ \ | | | | | | | | | | Fix #include in js_generator.cc
| * | | | Fix #include in js_generator.ccAdam Michalik2016-05-171-1/+1
| |/ / / | | | | | | | | | | | | | | | | The commit 3b3c8abb9635eb3ea078a821a99c9ef29d66dff7 has replaced the <> with "" in #include statement in js_generator.cc
* / / / Integrate interanl changesBo Yang2016-05-182-1/+2
|/ / /
* | | Merge pull request #1542 from google/beta-3Jisi Liu2016-05-163-9/+60
|\ \ \ | | | | | | | | Merge Beta 3 release branch into master
| * | | Remove the comments about iterator validationJisi Liu2016-05-131-3/+1
| | | | | | | | | | | | | | | | As it may be implementation dependent.
| * | | Merge pull request #1520 from pherl/hashmapvs2008Jisi Liu2016-05-121-3/+55
| |\ \ \ | | | | | | | | | | Bridge vs2008 hashmaps.
| | * | | Bridge vs2008 hashmaps.Jisi Liu2016-05-111-3/+55
| | | | |
| * | | | Fix the command line interface unittest againJisi Liu2016-05-101-3/+4
| |/ / / | | | | | | | | | | | | | | | | This time move the macro inside namespaces; hopefully will work with the integration script.
* | | | Merge pull request #1483 from wal-rus/fix-boost-incompatibilityFeng Xiao2016-05-111-3/+1
|\ \ \ \ | |/ / / |/| | | Fix C++ Boost incompatibility on Windows/MSVC
| * | | Remove confounding and unused #define - breaks boost/predef/other/endian.hWalter Gray2016-05-061-3/+1
| | | |
* | | | Merge pull request #1499 from beardedN5rd/masterFeng Xiao2016-05-061-1/+4
|\ \ \ \ | | | | | | | | | | updated README
| * | | | after comment of Feng Xiao changed the entry to g++beardedn5rd2016-05-061-2/+2
| | | | |
| * | | | updated READMEbeardedn5rd2016-05-061-1/+4
| |/ / /
* | | | Updated README.mdMahmut Ali ÖZKURAN2016-05-061-1/+1
| | | | | | | | | | | | Added relative link to cmake guide.
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-17 23:49:15 +0000