1. 01 Mar, 2017 4 commits
    • Matt Hauck's avatar
      Fix gcc 4.1 build (#1035) (#1913) · 6011d7ca
      Matt Hauck authored
      * Fix gcc 4.1.2 compilation of map_field_inl.h
      
      Fixes "error: object missing in reference to '...'" errors from #1035
      
      * Disable 64-bit map keys on gcc <= 4.1
      
      * Add missing case statements
      6011d7ca
    • Matt Hauck's avatar
      Change hint type to `const void*` (#2568) · 25ecd559
      Matt Hauck authored
      This is both more correct, and the build fails on AIX without it
      25ecd559
    • Paul Yang's avatar
      Add mergeFrom method on Message (#2766) · bcbaabe5
      Paul Yang authored
      This method merges the contents of the specified message into the
      current message. Singular fields that are set in the specified message
      overwrite the corresponding fields in the current message.  Repeated
      fields are appended. Map fields key-value pairs are overritten.
      Singular/Oneof sub-messages are recursively merged. All overritten
      sub-messages are deep-copied.
      bcbaabe5
    • Adam Cozzette's avatar
      Merge pull request #2674 from acozzette/js-test-cleanup · 7339fc04
      Adam Cozzette authored
      Removed log statement from writer_test.js
      7339fc04
  2. 28 Feb, 2017 7 commits
  3. 27 Feb, 2017 2 commits
  4. 24 Feb, 2017 5 commits
  5. 23 Feb, 2017 5 commits
  6. 22 Feb, 2017 1 commit
  7. 21 Feb, 2017 1 commit
  8. 19 Feb, 2017 1 commit
  9. 18 Feb, 2017 2 commits
  10. 17 Feb, 2017 2 commits
  11. 16 Feb, 2017 1 commit
  12. 15 Feb, 2017 5 commits
  13. 14 Feb, 2017 3 commits
  14. 13 Feb, 2017 1 commit