Ian Hunter
130bb0739a
typo
2016-11-16 17:34:28 +00:00
Feng Xiao
83d6411bf3
Fix jenkins tests.
2016-11-15 14:15:57 -08:00
Joshua Haberman
bf379715c9
Merge pull request #2323 from marcinwyszynski/master
...
More Ruby-eqsue interface
2016-11-15 10:31:15 -08:00
Joshua Haberman
c6f3d700b9
Merge pull request #1907 from evokly/js-utf8-fix
...
JS: Fix for high utf-8 codepoints.
2016-11-15 09:29:46 -08:00
Wojciech Mandrysz
bd850a25f5
JS: Well, this is the right place for surrogates.
2016-11-15 14:10:09 +01:00
Wojciech Mandrysz
292c2c91cf
JS: Re-added comment, moved surrogates code to the right place
2016-11-15 12:44:15 +01:00
Feng Xiao
6e93fa41c4
Merge pull request #2366 from jbrianceau/reland-fix-include-js-generator
...
Fix #include in js_generator.cc
2016-11-14 13:50:51 -08:00
Feng Xiao
a95d052bdb
Merge pull request #2368 from jbrianceau/fix-json-style-in-project-json
...
Fix csharp/src/Google.Protobuf.Test/project.json
2016-11-14 13:40:59 -08:00
Julien Brianceau
3c0e0ce2b0
Fix csharp/src/Google.Protobuf.Test/project.json
...
This change fixes the following Chromium presubmit error:
third_party/protobuf/csharp/src/Google.Protobuf.Test/project.json could
not be parsed: Expecting property name: line 25 column 3 (char 482)
2016-11-14 22:32:15 +01:00
Julien Brianceau
3316062e98
Fix #include in js_generator.cc
...
Reland commit f2885f6
that has been trampled by commit d64a2d99
.
2016-11-14 22:13:16 +01:00
Marcin Wyszynski
74a636a7a2
Move variable declarations before actual code
2016-11-14 21:45:37 +01:00
Joshua Haberman
0c0f7e2aa8
Merge pull request #2364 from haberman/jslicense
...
Fixed JavaScript license declaration.
2016-11-14 11:45:36 -08:00
Josh Haberman
5d9dbe3ecc
Fixed JavaScript license declaration.
2016-11-14 10:37:51 -08:00
Feng Xiao
a30e5af204
Merge pull request #2358 from ckennelly/master
...
Resolve old TODO for StringTypeHandler.
2016-11-11 16:22:16 -08:00
Chris Kennelly
e02cb2bb83
Resolve old TODO for StringTypeHandler.
...
StringSpaceUsedExcludingSelf has been part of the lite library since
b913cbd
.
2016-11-11 16:10:41 -08:00
Feng Xiao
8a4b2c573a
Merge pull request #2353 from guptasu/master
...
MessageOptions should handle both proto2 and google.protobuf package names.
2016-11-11 12:31:52 -08:00
Feng Xiao
df56736db9
Merge pull request #2357 from D3Hunter/master
...
#2356 : fix ExceptionInInitializerError on IBM J9
2016-11-11 10:45:54 -08:00
Time
ed08341234
#2356 : fix ExceptionInInitializerError on IBM J9
2016-11-11 16:47:41 +08:00
Paul Yang
df8390790a
Fix php c extension on 32-bit machines. ( #2348 )
2016-11-10 11:20:50 -08:00
Feng Xiao
9f75c5aa85
Merge pull request #2337 from sergiocampama/deprecation
...
Fixes deprecation warnings/errors on Xcode
2016-11-10 10:48:51 -08:00
guptasu
fce8b6b924
Made helper code also consider package name 'proto2' when dealing with MessageOptions.
...
This is done so that the same library can be used irrespective of whether MessageOptions belong to package name 'proto2' or 'google.protobuf'
2016-11-10 10:23:00 -08:00
Sergio Campama
e75cf40e8f
Fixing references to the removed atomicops_internals_pnacl.h file.
2016-11-10 10:20:07 -05:00
Adam Cozzette
ce5160b83b
Merge pull request #2332 from Kwizatz/master
...
Added explicit cast to avoid size warning on Win64.
2016-11-09 13:07:24 -08:00
Adam Cozzette
d584321fb4
Merge pull request #2327 from ctubbsii/fix-maven-compiler-plugin
...
Use latest maven-compiler-plugin (2.6.0)
2016-11-09 11:49:55 -08:00
Paul Yang
1f2dbc899b
Implement RepeatedFieldIter for c extension. ( #2333 )
2016-11-08 11:38:34 -08:00
Sergio Campama
ecc460ab1b
Renamed the pnacl version of atomicops.h into C11 atomic, and flagged the mac version to that if atomic is enabled
2016-11-07 15:43:12 -05:00
Rodrigo Hernandez
975d577a2b
Added explicit cast to avoid size warning on Win64.
2016-11-04 14:52:54 -06:00
Adam Cozzette
0d7199edc8
Merge pull request #2329 from acozzette/unused-parameter
...
Fix unused parameter warnings in arena_free
2016-11-04 12:19:46 -07:00
Jisi Liu
ca800ea823
Merge pull request #2330 from manupsunny/master
...
Fix message for InvalidProtocolBufferException
2016-11-04 11:37:40 -07:00
Msp
089aaa996a
Fix message for InvalidProtocolBufferException
2016-11-04 23:54:34 +05:30
Adam Cozzette
8785004c80
Fix unused parameter warnings in arena_free
...
The size parameter is only used in cases where the compiler supports
sized delete, so when that's not available we need to specifically cast
it to void to prevent a warning.
2016-11-04 10:01:16 -07:00
Christopher Tubbs
eb7f3a3ad1
Use latest maven-compiler-plugin (2.6.0)
...
* Uses build-helper-maven-plugin to add generated sources to the classpath
* Fixes an issue building with newer versions of the maven-compiler-plugin
(See https://issues.apache.org/jira/browse/MCOMPILER-240 )
2016-11-04 02:11:55 -04:00
Feng Xiao
7bd11fcb59
Merge pull request #2301 from jbrianceau/arm-atomic-kuser-helpers-fix-v2
...
[arm/gcc] Don't rely on KUSER_HELPERS feature for atomics
2016-11-03 16:59:25 -07:00
Jon Skeet
4c310d78a2
Update conformance test failure list
2016-11-03 18:05:59 +00:00
Jon Skeet
50a37e0135
Change JSON field name formatting
...
This affects cases with leading capital letters.
This breaks compatibility with previous C# releases, but
fixes compatibility with other implementations.
See #2278 for details.
2016-11-03 18:05:59 +00:00
Marcin Wyszynski
cb81314b1b
Fix copy pasta in test
2016-11-03 15:00:40 +01:00
Marcin Wyszynski
3bdaaa5dda
More Ruby-eqsue interface
2016-11-03 14:19:10 +01:00
Jisi Liu
93a4fa23d0
Merge pull request #2302 from jbrianceau/generic-gcc-atomics-strong-cmpxchg
...
generic atomicops: Use strong compare_exchange
2016-11-02 15:03:19 -07:00
Feng Xiao
750b9e2428
Merge pull request #2318 from mavrukin/patch-1
...
Fix compiler warnings when running :protobuf_test
2016-11-02 11:54:13 -07:00
Michael Avrukin
4d813de095
Fix compiler warnings when running :protobuf_test
...
When running >bazel test :protobuf_test a few compiler warnings came up. They were centered around the usage of "int" as the loop counter where the value should have been a size_t.
2016-11-02 16:12:07 +02:00
Feng Xiao
8fcd24b8db
Merge pull request #2307 from sinzianag/swift_protobuf
...
Docs: Link to Apple's Swift plugin and runtime for protobufs
2016-10-31 11:00:43 -07:00
Thomas Van Lenten
ea928a1811
Merge pull request #2309 from thomasvl/note_about_coding_support
...
Add note about extension use and Coding support.
2016-10-31 11:08:36 -04:00
Thomas Van Lenten
98c01858f2
Add note about extension use and Coding support.
2016-10-31 11:00:39 -04:00
Sinziana Gafitanu
9819b72d49
Adding Apple's Swift Protobuf
2016-10-30 19:40:08 -07:00
Julien Brianceau
a5a2c1d78f
generic atomicops: Use strong compare_exchange
...
Weak compare-and-exchange are allowed to fail spuriously, so we have
to use the strong variation here.
2016-10-28 14:27:03 +02:00
Julien Brianceau
4587a3fd07
[arm/gcc] Don't rely on KUSER_HELPERS feature for atomics
...
ARM specific CONFIG_KUSER_HELPERS feature can be disabled in Linux kernel,
and in this case, we shouldn't crash. Use gcc built-in functions instead
of arm specific code if they are available.
2016-10-28 14:02:41 +02:00
Sergio Campamá
d58b92ae51
Adds pushLimit: and popLimit: into GPBCodedInputStream ( #2297 )
...
Adds pushLimit: and popLimit: into GPBCodedInputStream
2016-10-27 16:06:45 -04:00
Paul Yang
795976ecf5
Trigger update of docker for new changes in #2282 . ( #2288 )
2016-10-27 10:41:44 -07:00
Feng Xiao
e9d9e56a6b
Merge pull request #2290 from ramrunner/OpenBSDsupport
...
define no_threadlocal on OpenBSD
2016-10-26 16:53:14 -07:00
ramrunner
bfc1299a09
define no_threadlocal on OpenBSD
2016-10-26 17:05:56 -06:00