Adam Cozzette
25dbc8b1ea
Updated .gitignore with Java and JavaScript build artifacts
2016-09-29 16:20:43 -07:00
Thomas Van Lenten
3d598eecee
Merge pull request #2197 from thomasvl/swift_docs
...
Drop the swift docs directory (and content).
2016-09-28 15:34:16 -04:00
Thomas Van Lenten
fb85b4316b
Drop the swift docs directory (and content).
...
Since the official home is looking like it will be in another repo, it makes
more sense for the relevant docs to live there instead.
2016-09-28 15:32:51 -04:00
Jisi Liu
3f59452448
Merge pull request #2192 from google/3.0.x
...
Merge 3.0.x into master.
2016-09-27 14:19:30 -07:00
Joshua Haberman
a289d43608
Added C++ benchmark. ( #1525 )
2016-09-23 11:07:45 -07:00
Feng Xiao
d9ff3ef859
Merge pull request #2153 from haberman/generatechangelog
...
Added convenient script for generating changelog draft.
2016-09-23 10:49:13 -07:00
Jan Tattermusch
1bf97d87f5
Merge pull request #2159 from google/jtattermusch-patch-1
...
Update README.md
2016-09-22 11:22:18 +02:00
Jan Tattermusch
da7c026ce1
Update README.md
2016-09-22 11:07:37 +02:00
Jan Tattermusch
ca21b28287
Merge pull request #2157 from google/csharp_remove_beta_notice
...
Update README.md
2016-09-22 11:04:56 +02:00
Jan Tattermusch
ca8120cfcc
Update README.md
2016-09-22 10:08:59 +02:00
Bo Yang
b28ab73d22
Fix gson dependency.
...
gson 2.3 has internal bug that it doesn't work with some versions of maven.
2016-09-21 22:51:36 +00:00
Feng Xiao
142e2fa45e
Merge pull request #2035 from sergiocampama/cpp
...
Fixes static analyzer issues from xcode.
2016-09-21 15:19:54 -07:00
Josh Haberman
a2e73644be
Added convenient script for generating changelog draft.
2016-09-21 14:41:57 -07:00
Feng Xiao
e25c56a861
Merge pull request #2149 from khingblue/remove-obsoleted-project
...
Remove obsoleted project of j2me
2016-09-21 12:28:15 -07:00
Khing
741aa87942
Remove obsoleted project of j2me
2016-09-21 12:32:14 +10:00
Sergio Campama
1af7c4cb08
Fixes static analyzer issues from xcode.
2016-09-20 17:59:27 -07:00
Joshua Haberman
4f379f81ce
Merge pull request #2144 from abscondment/fix-jruby-hash
...
Fix hash computation for JRuby's RubyMessage
2016-09-20 15:25:01 -07:00
Brendan Ribera
05aa0df532
Fix hash computation for JRuby's RubyMessage
...
`System.identityHashCode` returns a hash that does not consider a
Message's values. This means two Messages with identical values will not
have identical hashCodes.
This patch uses the pattern from RubyMap to combine the hashCodes from
all values in a given message and produce a unique, consistent,
value-based hash.
2016-09-20 11:07:42 -07:00
Thomas Van Lenten
7b00595ddf
Merge pull request #2137 from thomasvl/objc_extensions_tweak
...
Objc extensions tweaks
2016-09-19 13:50:32 -04:00
Thomas Van Lenten
6ab51a0ebd
Use a custom dictionary to avoid NSNumber operations.
...
For the secondary dictionary, use a custom CFDictionary with integer keys to
avoid the NSNumber conversions.
2016-09-19 13:12:54 -04:00
Thomas Van Lenten
5904279ebd
Remove the custom key functions and just use the system provided defaults.
2016-09-19 13:12:35 -04:00
Joshua Haberman
b5bbdb0967
Merge pull request #2037 from abscondment/fix-2036-ruby-hash
...
Fix #2036 (Ruby `hash` broken for Messages with repeated fields.)
2016-09-18 21:38:51 -07:00
Feng Xiao
c44ca26fe8
Merge pull request #2130 from kilink/substring-comment-fix
...
Fix erroneous comment regarding String.substring
2016-09-16 17:07:57 -07:00
Patrick Strawderman
9ac84f8f3f
Fix erroneous comment regarding String.substring
...
Since Java 7, Strings produced with String.substring do not share byte arrays.
2016-09-16 14:54:58 -07:00
Bo Yang
3b001ca6ba
Some php engine implementation doesn't have return_value_ptr properly set. Explicitly use &return_value.
2016-09-15 17:59:49 -07:00
Bo Yang
c6fa9c71a5
Auto-generate proto files for tests.
2016-09-15 17:59:49 -07:00
Bo Yang
f174d36380
Add back missing test proto files.
2016-09-15 17:59:49 -07:00
Jisi Liu
37e0e1ff86
Merge pull request #2111 from pherl/3.0.x
...
Fix the version number for 3.0.2
2016-09-15 15:01:59 -07:00
Jisi Liu
9c4be5f654
Merge pull request #2112 from pherl/merge
...
Merge 3.0.x into master
2016-09-15 14:37:38 -07:00
Thomas Van Lenten
b4235ac79c
Merge pull request #2123 from thomasvl/objc_better_versioning_take2
...
Update the ObjC version checks to support a min and current version.
2016-09-15 17:36:08 -04:00
Thomas Van Lenten
1aa6500056
Update the ObjC version checks to support a min and current version.
...
- Capture the version used to generated.
- Check at compile time and runtime that generated code isn't from a newer
version, also check that the min version required is also supported.
- Keep the old constants/macros/functions to special case the last version
that was working so those generated sources still work until we decide
otherwise.
2016-09-15 17:22:51 -04:00
Paul Yang
e0e54661f7
Check in php implementation. ( #2052 )
...
This pull request includes two implementation: C extension and PHP
package. Both implementations support encode/decode of singular,
repeated and map fields.
2016-09-15 11:09:01 -07:00
Jisi Liu
683412b23f
Update generated files.
2016-09-14 10:27:22 -07:00
Jisi Liu
58860c021f
Merge remote-tracking branch 'origin/3.0.x' into merge
2016-09-14 09:37:48 -07:00
Jisi Liu
13d6d17262
Fix the version number for 3.0.2
2016-09-13 11:36:19 -07:00
Feng Xiao
86fcd879b3
Merge pull request #1765 from mbarbon/master
...
Add https://metacpan.org/pod/Google::ProtocolBuffers::Dynamic
2016-09-12 20:45:28 -07:00
Feng Xiao
1affbd8717
Merge pull request #2021 from zlim/bench-fix
...
benchmarks: update readme.txt
2016-09-12 16:08:16 -07:00
Feng Xiao
4f032cd9af
Merge pull request #2100 from vladmos/patch-1
...
Compatibility with the new version of Bazel.
2016-09-12 10:02:39 -07:00
Feng Xiao
22e7fa6aef
Merge pull request #2092 from dprotaso/master
...
Allow the JsonFormat.Parser to ignore unknown fields
2016-09-12 09:53:27 -07:00
Vladimir Moskva
5caf516976
Resolved a conflict
2016-09-12 11:27:28 +02:00
Feng Xiao
78aee1b15f
Merge pull request #2044 from wychen/Win32ANSI
...
Fix Win32 error messages on Unicode build
2016-09-09 16:46:50 -07:00
Jisi Liu
643a02bc9c
Merge pull request #1636 from yugui/feature/generic-plugin
...
Generalize plugin support in Bazel Skylark rule
2016-09-09 15:00:25 -07:00
Feng Xiao
53387e5f55
Merge pull request #2090 from guoxiao/find
...
include std::find()
2016-09-09 12:44:34 -07:00
Feng Xiao
e90292b2a6
Merge pull request #2103 from adrianludwin/fix-gtest
...
Update repo in Bazel build files to use googletest instead of the deprecated gMock
2016-09-09 11:54:49 -07:00
Adrian Ludwin
1327e6f470
Update repo to use google test
2016-09-09 13:10:56 -04:00
Thomas Van Lenten
7377eb2b03
Merge pull request #1970 from thomasvl/objc_any_helpers
...
Objc any helpers
2016-09-09 11:02:09 -04:00
Vladimir Moskva
a86e6d8db2
Compatibility with the new version of Bazel.
...
Global variable HOST_CFG is deprecated and will not be supported soon.
2016-09-09 13:21:35 +02:00
Thomas Van Lenten
5d35e60900
Merge pull request #2094 from thomasvl/update_wkt_comments
...
Fix error and add note about lossy issues
2016-09-08 17:02:43 -04:00
Jisi Liu
57170b9343
Merge pull request #2096 from pherl/3.0.x
...
Cherry pick objc test changes into 3.0.x branch
2016-09-08 12:49:55 -07:00
Thomas Van Lenten
5699b920bf
More complete nil/reset tests within a oneof
2016-09-08 12:45:20 -07:00