Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Get the map factory per mergeFrom() call for JavaNano. | Jisi Liu | 2015-02-07 | 4 | -1/+19 |
| | |||||
* | implement hashCode() for JavaNano maps. | Jisi Liu | 2015-02-06 | 1 | -0/+3 |
| | |||||
* | Implement Equals for nano. | Jisi Liu | 2015-02-06 | 1 | -0/+5 |
| | |||||
* | Fix the behavior when merging conflicting keys, the new value always | Jisi Liu | 2015-02-05 | 1 | -3/+3 |
| | | | | override the existing one even for message types. | ||||
* | Moving internal code to InternalNano and rename MapUtil to MapFactories. | Jisi Liu | 2015-02-04 | 1 | -3/+3 |
| | |||||
* | parsing and serialzation for maps in JavaNano. | Jisi Liu | 2015-02-03 | 1 | -5/+20 |
| | |||||
* | Parsing for Maps in JavaNano | Jisi Liu | 2015-02-02 | 2 | -16/+93 |
| | |||||
* | Use map generator for maps field; skip entry message. | Jisi Liu | 2015-02-02 | 2 | -1/+9 |
| | |||||
* | Initial checkin for maps support in JavaNano. | Jisi Liu | 2015-01-30 | 4 | -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-27 | 1 | -1/+1 |
| | | | | pointer. | ||||
* | Align backslash vertically | zhangkun83 | 2015-01-12 | 1 | -1/+1 |
| | |||||
* | Include names.h as java_names.h in the opensource tree | zhangkun83 | 2015-01-12 | 2 | -0/+88 |
| | |||||
* | Improved little endian byte order detection | Kal Conley | 2014-12-16 | 1 | -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 Fallin | 2014-12-12 | 1 | -0/+8 |
| | |||||
* | Add missing header files in src/Makefile.am | Feng Xiao | 2014-12-12 | 1 | -1/+3 |
| | |||||
* | Rename protobuf Ruby module to google/protobuf and rework its build | Chris Fallin | 2014-12-12 | 1 | -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/master | Feng Xiao | 2014-12-12 | 2 | -14/+14 |
|\ | | | | | Source code refactoring. Extracted common functionality in cpp_helpers.c... | ||||
| * | Reverting the space at the end for both files changed | Krishna | 2014-12-12 | 2 | -2/+2 |
| | | |||||
| * | Reverting the space at the end | Krishna | 2014-12-12 | 1 | -1/+1 |
| | | |||||
| * | Returned print_indent and print_outdent back to printservicestub and ↵ | Krishna | 2014-12-12 | 1 | -5/+8 |
| | | | | | | | | printserviceclass in python generator | ||||
| * | Reverted changes to cpp_helpers.cc and made code reviews to python_geenerator.cc | Krishna | 2014-12-11 | 3 | -22/+20 |
| | | |||||
| * | Fixed bugs | Krishna | 2014-12-10 | 3 | -5/+8 |
| | | |||||
| * | Source code refactoring. Extracted common functionality in cpp_helpers.cc ↵ | Krishna | 2014-12-10 | 2 | -26/+22 |
| | | | | | | | | and python/python_generator.cc | ||||
* | | Merge pull request #113 from nsuke/oneof-c++11 | Feng Xiao | 2014-12-11 | 5 | -41/+40 |
|\ \ | | | | | | | Make C++ code generation of string oneof field compatible with C++11 | ||||
| * | | Make C++ string oneof field compatible with C++11 | Nobuaki Sukegawa | 2014-12-03 | 2 | -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 log | Nobuaki Sukegawa | 2014-12-03 | 1 | -2/+2 |
| | | | |||||
| * | | Make test code runnable with C++11 | Nobuaki Sukegawa | 2014-12-03 | 3 | -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 Xiao | 2014-12-10 | 28 | -109/+143 |
|\ \ | | | | | | | | | | | | | Conflicts: configure.ac | ||||
| * | | Fix LIBPROTOBUF_PROTOBUF annotations for buliding protobuf as DLLs.v3.0.0-alpha-1 | Feng Xiao | 2014-12-09 | 8 | -18/+33 |
| | | | |||||
| * | | Remove map_field.cc from lite-runtime. | Feng Xiao | 2014-12-09 | 1 | -1/+1 |
| | | | |||||
| * | | Fix compile issues and test failures in VS2008. | Feng Xiao | 2014-12-05 | 13 | -74/+44 |
| | | | |||||
| * | | Fix thread local annotatoin and add back type traits is_convertable for MSVC | Feng Xiao | 2014-12-04 | 4 | -4/+10 |
| | | | |||||
| * | | Replace is_enum with is_proto_enum because is_enum is not supported on some ↵ | Feng Xiao | 2014-12-03 | 1 | -1/+3 |
| | | | | | | | | | | | | platforms. | ||||
| * | | Delete some globals in ShutdownProtobufLibrary(). | Feng Xiao | 2014-12-03 | 3 | -0/+37 |
| | | | |||||
| * | | Update version number in descriptor.pb.h and plugin.pb.h. Protect death | Feng Xiao | 2014-12-03 | 4 | -4/+8 |
| | | | | | | | | | | | | tests with macro PROTOBUF_HAS_DEATH_TEST. | ||||
| * | | Update version number to v3.0.0-alpha-1 | Feng Xiao | 2014-12-03 | 2 | -8/+8 |
| |/ | |||||
* / | Provide a Ruby extension. | Chris Fallin | 2014-12-09 | 4 | -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_warnings | Feng Xiao | 2014-12-02 | 6 | -9/+12 |
|\ | | | | | Get rid of some build warnings. | ||||
| * | Get rid of some build warnings. | Feng Xiao | 2014-12-02 | 6 | -9/+12 |
| | | |||||
* | | Merge pull request #81 from xfxyjwf/syntax_warning | Feng Xiao | 2014-12-02 | 2 | -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 Xiao | 2014-11-14 | 2 | -0/+13 |
| | | |||||
* | | Merge pull request #110 from nsuke/tb-typo-cpp_extension | Feng Xiao | 2014-11-26 | 1 | -1/+1 |
|\ \ | | | | | | | Fix typo | ||||
| * | | Fix typo | Nobuaki Sukegawa | 2014-11-27 | 1 | -1/+1 |
| | | | |||||
* | | | Down-integrate from internal code base. | Feng Xiao | 2014-11-26 | 8 | -45/+221 |
|/ / | |||||
* | | Merge branch 'master' of github.com:google/protobuf | Jisi Liu | 2014-11-25 | 6 | -10/+54 |
|\ \ | |||||
| * | | Fix issue 99. | Feng Xiao | 2014-11-25 | 5 | -7/+48 |
| | | | |||||
| * | | Fix "anonymous types declared in an anonymous union are an extension" | Łukasz Twarduś | 2014-11-25 | 1 | -3/+6 |
| | | | | | | | | | | | | warning when using clang with -pedantic switch | ||||
* | | | Link Java Nano generator into protoc. | Jisi Liu | 2014-11-25 | 2 | -0/+27 |
|/ / | |||||
* | | Down-integrate from internal code base. | Feng Xiao | 2014-11-20 | 15 | -178/+597 |
| | | |||||
* | | Merge nano proto into protobuf repository. | Feng Xiao | 2014-11-19 | 21 | -0/+5013 |
|\ \ | | | | | | | | | | Source: https://android.googlesource.com/platform/external/protobuf.git |