aboutsummaryrefslogtreecommitdiff
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Fix the behavior when merging conflicting keys, the new value alwaysJisi Liu2015-02-051-3/+3
| | | | override the existing one even for message types.
* Moving internal code to InternalNano and rename MapUtil to MapFactories.Jisi Liu2015-02-041-3/+3
|
* parsing and serialzation for maps in JavaNano.Jisi Liu2015-02-031-5/+20
|
* Parsing for Maps in JavaNanoJisi Liu2015-02-022-16/+93
|
* Use map generator for maps field; skip entry message.Jisi Liu2015-02-022-1/+9
|
* Initial checkin for maps support in JavaNano.Jisi Liu2015-01-304-10/+174
|
* Fix illegal C++ use of reinterpret_cast<> to cast between nullptr_t and a ↵Niall Douglas (s [underscore] sourceforge {at} nedprod [dot] com)2015-01-271-1/+1
| | | | pointer.
* Align backslash verticallyzhangkun832015-01-121-1/+1
|
* Include names.h as java_names.h in the opensource treezhangkun832015-01-122-0/+88
|
* Improved little endian byte order detectionKal Conley2014-12-161-1/+2
| | | | | | | Including <sys/param.h> on Mac/iOS doesn't define __BYTE_ORDER so PROTOBUF_LITTLE_ENDIAN was never being defined. This commit adds a check for the __LITTLE_ENDIAN__ macro which is defined by clang and Apple gcc on little endian architectures.
* Support Ruby code generation only for proto3.Chris Fallin2014-12-121-0/+8
|
* Add missing header files in src/Makefile.amFeng Xiao2014-12-121-1/+3
|
* Rename protobuf Ruby module to google/protobuf and rework its buildChris Fallin2014-12-121-1/+1
| | | | | | system. The Ruby module build now uses an amalgamated distribution of upb, and successfully builds a Ruby gem called 'google-protobuf' with module 'google/protobuf'.
* Merge pull request #128 from krishnanm86/masterFeng Xiao2014-12-122-14/+14
|\ | | | | Source code refactoring. Extracted common functionality in cpp_helpers.c...
| * 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 ↵Krishna2014-12-121-5/+8
| | | | | | | | printserviceclass in python generator
| * 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 ↵Krishna2014-12-102-26/+22
| | | | | | | | and python/python_generator.cc
* | Merge pull request #113 from nsuke/oneof-c++11Feng Xiao2014-12-115-41/+40
|\ \ | | | | | | Make C++ code generation of string oneof field compatible with C++11
| * | 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.
* | Merge branch v3.0.0-alpha-1 into master.Feng Xiao2014-12-1028-109/+143
|\ \ | | | | | | | | | | | | Conflicts: configure.ac
| * | 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 ↵Feng Xiao2014-12-031-1/+3
| | | | | | | | | | | | platforms.
| * | 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
| | | | | | | | | | | | tests with macro PROTOBUF_HAS_DEATH_TEST.
| * | Update version number to v3.0.0-alpha-1Feng Xiao2014-12-032-8/+8
| |/
* / Provide a Ruby extension.Chris Fallin2014-12-094-2/+378
|/ | | | | | This adds a Ruby extension in ruby/ that is based on the 'upb' library (now included as a submodule), and adds support for Ruby code generation to the protoc compiler.
* Merge pull request #116 from xfxyjwf/fix_warningsFeng Xiao2014-12-026-9/+12
|\ | | | | Get rid of some build warnings.
| * 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.
| * 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 typo
| * | 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
| | | | | | | | | | | | 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-2015-178/+597
| |
* | Merge nano proto into protobuf repository.Feng Xiao2014-11-1921-0/+5013
|\ \ | | | | | | | | | Source: https://android.googlesource.com/platform/external/protobuf.git
| * | 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
| | | | | | | | | | | | | | | | | | Make the clear() method stripped in reftypes_compat_mode. Change-Id: I0ec35537856f59a6ecf231bfd74df995c858e2b2
| * | Adds a primitive enum mode for reftypes.Brian Duff2014-09-304-4/+23
| | | | | | | | | | | | | | | | | | This is a compatibility shim. Change-Id: Ia0b417d4621e391ede618d0b3b1c470c9896e0ff