aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Make C++ string oneof field compatible with C++11Nobuaki Sukegawa2014-12-032-3/+2
| | | | | | | | | | | | string oneof field was generated into "const ArenaStringPtr" field inside "default_oneof_instance_" struct (of name "<class name>OneofInstance"). On the other hand, in C++11, const field of type with trivial default constructor causes enclosing type's implicit default constructor to be deleted. Since ArenaStringPtr has tirvial default constructor, this caused default constructor of "default_oneof_instance_" struct to be deleted, making the constructor call inside generated code invalid and fail to compile.
* Display element name in test error logNobuaki Sukegawa2014-12-031-2/+2
|
* Make test code runnable with C++11Nobuaki Sukegawa2014-12-033-37/+37
| | | | | Preprocessor token right after string literal without whitespace results in parse failure in C++11.
* Explicitly list all Java lite runtime tests (and exclude those dependingFeng Xiao2014-12-021-2/+4
| | | | TestUtil which transitively depend on the full runtime).
* Merge pull request #116 from xfxyjwf/fix_warningsFeng Xiao2014-12-027-9/+13
|\ | | | | Get rid of some build warnings.
| * Get rid of some build warnings.Feng Xiao2014-12-027-9/+13
| |
* | Merge pull request #115 from xfxyjwf/fix_107Feng Xiao2014-12-022-33/+47
|\ \ | | | | | | Add a ./configure flag "DIST_LANG".
| * | Add a ./configure flag "DIST_LANG" to select which langauge to includeFeng Xiao2014-12-022-33/+47
| |/ | | | | | | in a distribution package.
* | Merge pull request #111 from xfxyjwf/googlebotFeng Xiao2014-12-0227-27/+27
|\ \ | | | | | | Replace links in nano proto code.
| * | Replace links in nano proto code.Feng Xiao2014-11-2627-27/+27
| | |
* | | Merge pull request #105 from xfxyjwf/fix_92Feng Xiao2014-12-022-5/+9
|\ \ \ | | | | | | | | Fix Python C++ implementation build issues
| * | | Fix Python C++ implementation build issues:Feng Xiao2014-11-252-5/+9
| | | | | | | | | | | | | | | | | | | | 1. Haven't included the include path for "config.h". 2. Use of C++11 auto keyword.
* | | | 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.
| * | | Report a warning if the proto file doesn't have a syntax statement.Feng Xiao2014-11-142-0/+13
| | | |
* | | | Merge pull request #102 from fizbin/bytestring_serializableFeng Xiao2014-11-277-1/+90
|\ \ \ \ | | | | | | | | | | Make ByteStrings serializable with java serialization.
| * | | | Add tests for other ByteString subclassesDaniel Martin2014-11-272-0/+37
| | | | |
| * | | | Make ByteStrings serializable with java serialization.Daniel Martin2014-11-255-1/+53
| | | | |
* | | | | Merge pull request #109 from nsuke/tb-vim-oneofFeng Xiao2014-11-261-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Add oneof keyword to proto.vim
| * | | | | Add oneof keyword to proto.vimNobuaki Sukegawa2014-11-271-1/+1
| | | | | |
* | | | | | Merge pull request #110 from nsuke/tb-typo-cpp_extensionFeng Xiao2014-11-261-1/+1
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | Fix typo
| * | | | | Fix typoNobuaki Sukegawa2014-11-271-1/+1
| |/ / / /
* / / / / Down-integrate from internal code base.Feng Xiao2014-11-268-45/+221
|/ / / /
* | | | Make Java TextFormat.printToUnicodeString() escape newlines.Feng Xiao2014-11-252-6/+15
| | | | | | | | | | | | | | | | Fix issue #77
* | | | Merge pull request #106 from xfxyjwf/fix_62Feng Xiao2014-11-252-14/+14
|\ \ \ \ | |_|_|/ |/| | | Fix javadoc warnings.
| * | | Fix javadoc warnings.Feng Xiao2014-11-252-14/+14
|/ / /
* | | Merge pull request #104 from pherl/masterJisi Liu2014-11-252-0/+27
|\ \ \ | | | | | | | | Link Java Nano generator into protoc.
| * \ \ Merge branch 'master' of github.com:google/protobufJisi Liu2014-11-256-10/+54
| |\ \ \ | |/ / / |/| | |
* | | | Fix issue 99.Feng Xiao2014-11-255-7/+48
| | | |
* | | | Merge pull request #103 from Ang3lus/masterFeng Xiao2014-11-251-3/+6
|\ \ \ \ | |_|/ / |/| | | Fix "anonymous types declared in an anonymous union are an extension" warning when using clang with -pedantic switch
| * | | Fix "anonymous types declared in an anonymous union are an extension"Łukasz Twarduś2014-11-251-3/+6
|/ / / | | | | | | | | | warning when using clang with -pedantic switch
| * / Link Java Nano generator into protoc.Jisi Liu2014-11-252-0/+27
|/ /
* | Down-integrate from internal code base.Feng Xiao2014-11-2019-201/+624
| |
* | Add nano proto authors and update LICENSE file to include Android.mk.Feng Xiao2014-11-202-0/+8
| |
* | Merge pull request #91 from xfxyjwf/android_nanoFeng Xiao2014-11-2057-0/+15021
|\ \ | | | | | | Merge nano proto into protobuf repository.
| * | Fix the broken link at the bottom of javanano/README.txtFeng Xiao2014-11-201-1/+1
| | |
| * | Merge nano proto into protobuf repository.Feng Xiao2014-11-1957-0/+15021
| |\ \ | | | | | | | | | | | | Source: https://android.googlesource.com/platform/external/protobuf.git
| | * | Prepare nano proto code to be merged into protobuf repository.Feng Xiao2014-11-1946-394/+249
| | | |
| | * | Merge "Add platform versions of the protobuf libraries."Dan Albert2014-11-111-0/+37
| | |\ \
| | | * | Add platform versions of the protobuf libraries.Dan Albert2014-11-111-0/+37
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NDK libraries should not be linked in to platform code, so create a separate version for the platform that is linked against libc++ instead of the NDK STLs. Bug: 15193147 Change-Id: I3935e5dd3bd99676772a4b9681e275ef3601b855
| | * | am dbb9c303: Merge "Added an API method in FieldData to allow access to the ↵Behrooz Khorashadi2014-11-061-0/+17
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | UnknownField data" * commit 'dbb9c3033097e571e15c16d6e2e814be7e9d60bc': Added an API method in FieldData to allow access to the UnknownField data
| | | * \ Merge "Added an API method in FieldData to allow access to the UnknownField ↵Behrooz Khorashadi2014-11-061-0/+17
| | | |\ \ | | | | | | | | | | | | | | | | | | data"
| | | | * | Added an API method in FieldData to allow access to the UnknownField dataBehrooz Khorashadi2014-11-051-0/+17
| | | |/ / | | | | | | | | | | | | | | | Change-Id: I2cd5cfc80dce2a297fcd2511074b2a9d23d39837
| | * | | am 1ed1ec36: Merge "Move protobuf 2.3.0 to prebuilts."Jeff Davidson2014-10-291-10/+13
| | |\| | | | | | | | | | | | | | | | | | | | | | * commit '1ed1ec3609812a7818689cde01b6ce92d3f2315a': Move protobuf 2.3.0 to prebuilts.
| | | * | Merge "Move protobuf 2.3.0 to prebuilts."Jeff Davidson2014-10-281-10/+13
| | | |\ \
| | | | * | Move protobuf 2.3.0 to prebuilts.Jeff Davidson2014-10-221-10/+13
| | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will facilitate an upgrade to 2.6.0 and future versions without breaking applications which have a hardcoded dependency on 2.3.0. The existing make rules have been renamed to omit the version code. The prebuilts were built from a tree at commit 9be7e7401174d75e87e21fdc5f43549594a714bb. Change-Id: I90cf7f029217c8dc63a4b38252025c6b725d72a5
| | * | | am 9be7e740: Merge "Change reftypes_primitive_enums to reftypes_compat_mode."Brian Duff2014-10-033-12/+31
| | |\| | | | | | | | | | | | | | | | | | | | | | * commit '9be7e7401174d75e87e21fdc5f43549594a714bb': Change reftypes_primitive_enums to reftypes_compat_mode.
| | | * | Merge "Change reftypes_primitive_enums to reftypes_compat_mode."Brian Duff2014-10-023-12/+31
| | | |\ \
| | | | * | Change reftypes_primitive_enums to reftypes_compat_mode.Brian Duff2014-10-013-12/+31
| | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | Make the clear() method stripped in reftypes_compat_mode. Change-Id: I0ec35537856f59a6ecf231bfd74df995c858e2b2
| | * | | am 7d1ca13f: Merge "Adds a primitive enum mode for reftypes."Brian Duff2014-10-014-4/+23
| | |\| | | | | | | | | | | | | | | | | | | | | | * commit '7d1ca13f3781e8ccff0ecfab42250f1058c9152d': Adds a primitive enum mode for reftypes.
| | | * | Merge "Adds a primitive enum mode for reftypes."Brian Duff2014-10-014-4/+23
| | | |\ \