aboutsummaryrefslogtreecommitdiff
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Merge master branch.Feng Xiao2018-08-0838-169/+169
|\
| * 4593 Replace all occurrences of "NULL" to nullptr in src/google/protobug/stubsDhruv2018-08-0723-148/+148
| * Merge branch '3.6.x' into merge-3-6-xAdam Cozzette2018-08-0114-32/+32
| |\
| | * Updated version numbers to 3.6.1Adam Cozzette2018-07-2714-32/+32
| | * Remove js_embed binary. (#4709)Feng Xiao2018-07-163-130/+226
| * | Remove/replace travis references (#4953)Feng Xiao2018-07-221-1/+1
* | | Down-integrate from google3.Feng Xiao2018-08-08318-15613/+24500
|/ /
* | When running unit tests, read reference files in text modeStephen Oberholtzer2018-07-197-10/+15
* | Delete unused files. (#4942)Feng Xiao2018-07-198-2083/+0
* | Add cpp tests under release docker image.Feng Xiao2018-07-151-6/+6
* | fix commonjs js provide GOOGLE_CHECKYilun Chong2018-07-121-1/+1
* | OnShutdownDelete shadowing issueIvan Shynkarenka2018-07-101-1/+1
* | Merge pull request #4882 from google/3.6.xAdam Cozzette2018-07-0911-319/+132
|\|
| * Fix initialization with Visual StudioAdam Cozzette2018-07-0611-319/+132
* | Fix SFINAE in 'RepeatedPtrFieldBase::Add'M. Tong2018-07-061-2/+2
* | Merge pull request #4299 from hekike/feat/add-commonjs-strict-import-styleJoshua Haberman2018-07-022-10/+36
|\ \
| * | fix(js_generator): check for protoPeter Marton2018-05-211-0/+1
| * | Fix strict JS generator with import in a protofilePeter Marton2018-05-081-3/+6
| * | Feat: add import-style=commonjs_strict option to the compilerPeter Marton2018-05-082-10/+32
* | | Set LIBPROTOBUF_EXPORT on GenericTypeHandler<class google::protobuf::Message>Nehal J Wani2018-07-011-3/+3
* | | Set LIBPROTOBUF_EXPORT on GzipOutputStream::OptionsAdam Cozzette2018-07-011-1/+1
* | | Fix to allow a compilation under mips big endian with gccCharles Hardin2018-06-281-1/+1
* | | Add -Og to no-warning-test (#4830)Paul Yang2018-06-2811-37/+42
* | | Removed forward declaration of MemBlock classMichal Matuszak2018-06-251-1/+0
* | | Merge pull request #4827 from acozzette/merge-3-6-xAdam Cozzette2018-06-2517-41/+52
|\ \ \
| * \ \ Merge branch '3.6.x' into merge-3-6-xAdam Cozzette2018-06-2517-41/+52
| |\ \ \ | | | |/ | | |/|
| | * | Work around MSVC issue with std::atomic initialization (#4777)Adam Cozzette2018-06-181-0/+9
| | * | Move methods out of class (#4697)Paul Yang2018-05-302-15/+26
| | * | Add back GeneratedClassName to public (#4686)Paul Yang2018-05-301-0/+10
| | * | Fixed JS parsing of unspecified map keysAdam Cozzette2018-05-251-1/+5
| | * | PHP namespaces for nested messages and enums (#4536)Brent Shaffer2018-05-252-145/+187
| | * | PHP array constructors for protobuf messages (#4530)Brent Shaffer2018-05-251-8/+46
| | * | Adopt ruby_package in ruby generated code. (#4627)Paul Yang2018-05-251-3/+16
| | * | Adopt php_metadata_namespace in php code generator (#4622)Paul Yang2018-05-251-17/+37
| | * | Make sure to delete temporary maps used by FileDescriptorTablesAdam Cozzette2018-05-241-8/+6
| | * | Update version number to 3.6.0Jisi Liu2018-05-1414-32/+32
* | | | Merge pull request #4824 from sschuberth/remove-exec-bitFeng Xiao2018-06-257-0/+0
|\ \ \ \
| * | | | Remove the executable bit from several source code filesSebastian Schuberth2018-06-257-0/+0
| |/ / /
* | | | Merge pull request #4608 from khuzemap/masterFeng Xiao2018-06-2536-448/+473
|\ \ \ \
| * | | | Add "override" for overridden virtual functionsKhuzema Pithewan2018-06-1936-449/+474
| | |_|/ | |/| |
* | | | Merge pull request #4172 from OskarKinomoto/masterAdam Cozzette2018-06-251-0/+8
|\ \ \ \ | |_|/ / |/| | |
| * | | Add guards against bswap_XX redefnitionsOskar SĖwitalski2018-01-151-0/+8
* | | | Fix parameters declarationvervaekejonathan2018-06-221-2/+2
* | | | Merge pull request #4813 from htuch/fix-any-in-mapFeng Xiao2018-06-214-2/+21
|\ \ \ \
| * | | | protostream_objectwriter: fix bug when Any is directly embedded in a map.Harvey Tuch2018-06-214-2/+21
* | | | | Merge pull request #4812 from htuch/fix-any-caseFeng Xiao2018-06-213-0/+88
|\ \ \ \ \
| * | | | | Added TODO for grouping options.Harvey Tuch2018-06-211-0/+3
| * | | | | protostream_objectsource: preserve print options across Any.Harvey Tuch2018-06-213-0/+85
| |/ / / /
* | | | | Merge pull request #4811 from htuch/invalid-name-jsonFeng Xiao2018-06-211-1/+2
|\ \ \ \ \
| * | | | | Additional whitespace.Harvey Tuch2018-06-211-1/+1
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-14 06:35:50 +0000