aboutsummaryrefslogtreecommitdiff
path: root/src
Commit message (Expand)AuthorAgeFilesLines
...
| | * | | | implement hashCode() for JavaNano maps.Jisi Liu2015-02-061-0/+3
| | * | | | Implement Equals for nano.Jisi Liu2015-02-061-0/+5
| | * | | | Fix the behavior when merging conflicting keys, the new value alwaysJisi Liu2015-02-051-3/+3
| | * | | | 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
| | | |/ / | | |/| |
| * | | | Properly support maps in Ruby protoc and another bugfix.Chris Fallin2015-02-121-16/+59
| * | | | MIPS: remove immediate constraint within CompareAndSwap.Gordana Cmiljanovic2015-02-091-2/+2
| | |/ / | |/| |
| * | | Add missing LIBPROTOC_EXPORT to ruby generatorNobuaki Sukegawa2015-02-081-1/+2
| * | | Merge pull request #186 from ennerf/win32-msvc-fixFeng Xiao2015-02-021-2/+2
| |\ \ \
| | * | | removed accidental whitespaceFlorian Enner2015-02-021-1/+1
| | * | | replaced type fix with the recommended wayFlorian Enner2015-01-311-8/+2
| | * | | fixed MSVC compile errorFlorian Enner2015-01-311-0/+6
| | |/ /
| * | | Merge pull request #168 from cfallin/ruby-oneofJoshua Haberman2015-02-023-18/+166
| |\ \ \ | | |/ / | |/| |
| | * | Fix golden-file Ruby test to work with out-of-tree builds.Chris Fallin2015-01-141-33/+36
| | * | Two tests for Ruby code generator:Chris Fallin2015-01-142-0/+117
| | * | Support oneofs in the Ruby code generator.Chris Fallin2015-01-141-18/+46
| | |/
| * / Fix illegal C++ use of reinterpret_cast<> to cast between nullptr_t and a poi...Niall Douglas (s [underscore] sourceforge {at} nedprod [dot] com)2015-01-271-1/+1
| |/
| * 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
| * 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
* | 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