Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #186 from ennerf/win32-msvc-fix | Feng Xiao | 2015-02-02 | 1 | -2/+2 |
|\ | | | | | MSVC protoc compiler fix | ||||
| * | removed accidental whitespace | Florian Enner | 2015-02-02 | 1 | -1/+1 |
| | | |||||
| * | replaced type fix with the recommended way | Florian Enner | 2015-01-31 | 1 | -8/+2 |
| | | |||||
| * | fixed MSVC compile error | Florian Enner | 2015-01-31 | 1 | -0/+6 |
| | | | | | | | | <stdint.h> is not part of the standard, so I've added a workaround. | ||||
* | | Merge pull request #168 from cfallin/ruby-oneof | Joshua Haberman | 2015-02-02 | 2 | -18/+165 |
|\ \ | |/ |/| | Support oneofs in MRI Ruby C extension. | ||||
| * | Fix golden-file Ruby test to work with out-of-tree builds. | Chris Fallin | 2015-01-14 | 1 | -33/+36 |
| | | |||||
| * | Two tests for Ruby code generator: | Chris Fallin | 2015-01-14 | 1 | -0/+116 |
| | | | | | | | | | | | | | | | | | | | | | | | | - A golden-file test that ensures protoc produces known-valid output. - A Ruby test that loads that golden file and ensures it actually works with the extension. This split strategy allows us to test end-to-end without needing to integrate the Ruby gem build system and the protoc build system. This is desirable because we do not want a gem build/install to depend on building protoc, and we do not want building protoc to depend on building and testing the gem. | ||||
| * | Support oneofs in the Ruby code generator. | Chris Fallin | 2015-01-14 | 1 | -18/+46 |
| | | |||||
* | | 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. | ||||
* | Include names.h as java_names.h in the opensource tree | zhangkun83 | 2015-01-12 | 1 | -0/+87 |
| | |||||
* | 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 |
| | |||||
* | 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 | 27 | -105/+139 |
|\ \ | | | | | | | | | | | | | 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 |
| | | | |||||
| * | | 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 | 1 | -5/+5 |
| |/ | |||||
* / | Provide a Ruby extension. | Chris Fallin | 2014-12-09 | 3 | -1/+376 |
|/ | | | | | | 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 | 1 | -0/+6 |
|/ / | |||||
* | | 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 | ||||
| * | | Prepare nano proto code to be merged into protobuf repository. | Feng Xiao | 2014-11-19 | 31 | -1268/+33 |
| | | | |||||
| * | | Change reftypes_primitive_enums to reftypes_compat_mode. | Brian Duff | 2014-10-01 | 3 | -12/+31 |
| | | | | | | | | | | | | | | | | | | Make the clear() method stripped in reftypes_compat_mode. Change-Id: I0ec35537856f59a6ecf231bfd74df995c858e2b2 | ||||
| * | | Adds a primitive enum mode for reftypes. | Brian Duff | 2014-09-30 | 4 | -4/+23 |
| | | | | | | | | | | | | | | | | | | This is a compatibility shim. Change-Id: Ia0b417d4621e391ede618d0b3b1c470c9896e0ff | ||||
| * | | Includes a MessageNano subclass's name's hashCode in hashCode calculations. | Jason Neufeld | 2014-09-16 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the current implementation, a message with the same amount of null or equal-valued fields as a different message type will have the same hashCode. This adds more variety by including the hashCode of the class's name in the hashCode calculations. Change-Id: I284e3e6d198ad8037815948d1f65686465ffd623 Signed-off-by: Jason Neufeld <jneufeld@google.com> |