aboutsummaryrefslogtreecommitdiff
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Integrate changes from Google open-source branch.Josh Haberman2015-02-177-14/+35
* Merge pull request #128 from krishnanm86/masterFeng Xiao2014-12-122-14/+14
|\
| * Reverting the space at the end for both files changedKrishna2014-12-122-2/+2
| * Reverting the space at the endKrishna2014-12-121-1/+1
| * Returned print_indent and print_outdent back to printservicestub and printser...Krishna2014-12-121-5/+8
| * Reverted changes to cpp_helpers.cc and made code reviews to python_geenerator.ccKrishna2014-12-113-22/+20
| * Fixed bugsKrishna2014-12-103-5/+8
| * Source code refactoring. Extracted common functionality in cpp_helpers.cc and...Krishna2014-12-102-26/+22
* | Merge pull request #113 from nsuke/oneof-c++11Feng Xiao2014-12-115-41/+40
|\ \
| * | Make C++ string oneof field compatible with C++11Nobuaki Sukegawa2014-12-032-3/+2
| * | Display element name in test error logNobuaki Sukegawa2014-12-031-2/+2
| * | Make test code runnable with C++11Nobuaki Sukegawa2014-12-033-37/+37
| |/
* | Merge branch v3.0.0-alpha-1 into master.Feng Xiao2014-12-1028-109/+143
|\ \
| * | Fix LIBPROTOBUF_PROTOBUF annotations for buliding protobuf as DLLs.v3.0.0-alpha-1Feng Xiao2014-12-098-18/+33
| * | Remove map_field.cc from lite-runtime.Feng Xiao2014-12-091-1/+1
| * | Fix compile issues and test failures in VS2008.Feng Xiao2014-12-0513-74/+44
| * | Fix thread local annotatoin and add back type traits is_convertable for MSVCFeng Xiao2014-12-044-4/+10
| * | Replace is_enum with is_proto_enum because is_enum is not supported on some p...Feng Xiao2014-12-031-1/+3
| * | Delete some globals in ShutdownProtobufLibrary().Feng Xiao2014-12-033-0/+37
| * | Update version number in descriptor.pb.h and plugin.pb.h. Protect deathFeng Xiao2014-12-034-4/+8
| * | Update version number to v3.0.0-alpha-1Feng Xiao2014-12-032-8/+8
| |/
* / Provide a Ruby extension.Chris Fallin2014-12-094-2/+378
|/
* Merge pull request #116 from xfxyjwf/fix_warningsFeng Xiao2014-12-026-9/+12
|\
| * Get rid of some build warnings.Feng Xiao2014-12-026-9/+12
* | Merge pull request #81 from xfxyjwf/syntax_warningFeng Xiao2014-12-022-0/+13
|\ \ | |/ |/|
| * Report a warning if the proto file doesn't have a syntax statement.Feng Xiao2014-11-142-0/+13
* | Merge pull request #110 from nsuke/tb-typo-cpp_extensionFeng Xiao2014-11-261-1/+1
|\ \
| * | Fix typoNobuaki Sukegawa2014-11-271-1/+1
* | | Down-integrate from internal code base.Feng Xiao2014-11-268-45/+221
|/ /
* | Merge branch 'master' of github.com:google/protobufJisi Liu2014-11-256-10/+54
|\ \
| * | Fix issue 99.Feng Xiao2014-11-255-7/+48
| * | Fix "anonymous types declared in an anonymous union are an extension"Łukasz Twarduś2014-11-251-3/+6
* | | Link Java Nano generator into protoc.Jisi Liu2014-11-252-0/+27
|/ /
* | Down-integrate from internal code base.Feng Xiao2014-11-2015-178/+597
* | Merge nano proto into protobuf repository.Feng Xiao2014-11-1921-0/+5013
|\ \
| * | Prepare nano proto code to be merged into protobuf repository.Feng Xiao2014-11-1931-1268/+33
| * | Change reftypes_primitive_enums to reftypes_compat_mode.Brian Duff2014-10-013-12/+31
| * | Adds a primitive enum mode for reftypes.Brian Duff2014-09-304-4/+23
| * | Includes a MessageNano subclass's name's hashCode in hashCode calculations.Jason Neufeld2014-09-161-0/+1
| * | Don't return NULL from {Boxed}PrimitiveTypeName.Brian Duff2014-07-211-4/+4
| * | Fix access around unknownFieldData.Max Cai2014-07-153-9/+4
| * | Support generation of Parcelable nano messages.Jeff Davidson2014-04-253-2/+20
| * | Adds --ignore_service nano proto compiler flagJie Dai2014-04-233-2/+13
| * | Don't reset cachedSize to 0 in getSerializedSizeDave Hawkey2014-04-101-3/+2
| * | Revert "Don't reset cachedSize to 0 in getSerializedSize"Wink Saville2014-03-211-2/+3
| * | Don't reset cachedSize to 0 in getSerializedSizeDave Hawkey2014-03-211-3/+2
| * | Merge "Extension overhaul."Max Cai2014-02-179-131/+258
| |\ \
| | * | Extension overhaul.Max Cai2014-01-109-131/+258
| * | | Fix repeated packed field merging code for non-packed data.Max Cai2014-01-161-1/+4
| * | | Add validation when parsing enum fields.Max Cai2014-01-164-33/+148