Adam Cozzette
39f9b43219
Merge pull request #2403 from google/down-integrate-with-msvc-fix
...
Integrated internal changes from Google
8 years ago
Adam Cozzette
65479cb7b1
Fixed Ruby tests for JRuby 1.7
...
This makes a couple of changes to fix the tests for JRuby 1.7:
- Avoid using assert_false since that assertion seems not to exist in
older versions
- Disable a test related to respond_to? for JRuby. It's hard to tell
what is going wrong here but it looks like probably a JRuby bug that
has been fixed in more recent versions.
8 years ago
Adam Cozzette
259dd7e842
Updated descriptor_pool.py to be compatible with Python 3
...
In Python 3 the values() method on a dictionary returns a view instead
of a list, so we need to explicitly convert that to a list.
8 years ago
Adam Cozzette
db35fe735a
Add a "u" suffix to tag numbers in generated code
...
This seems to be necessary to prevent warnings in some compiler
configurations, particularly for tag numbers that are too large to fit
in a signed 32-bit int.
8 years ago
Adam Cozzette
a7f300d6ff
Fixed descriptor_pool_test.py for Python 2.6
...
The curly brace syntax for sets was introduced in Python 2.7, and so for
compatibility with 2.6 we need to avoid using it for now.
8 years ago
Feng Xiao
c950471563
Merge pull request #2404 from wiktortomczak/master
...
Support grpc plugin in py_proto_library
8 years ago
Wiktor Tomczak
0fa31b2bfa
Support grpc plugin in py_proto_library
8 years ago
Adam Cozzette
a41090ee6b
Updated failure_list_java.txt for Java conformance test
...
A new test is now passing and so we can remove it from the failure
whitelist.
8 years ago
Adam Cozzette
72002d8898
Merge pull request #2400 from acozzette/jspb-test-fixes
...
Fixed JSPB test failures
8 years ago
Adam Cozzette
fda876a149
Added back in binary serialization round-trip in message_test.js
8 years ago
Feng Xiao
b7632464b4
Merge pull request #2398 from jbrianceau/no-static-init-define-fix
...
C++: Fix use with GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER
8 years ago
Feng Xiao
04bd614711
Merge pull request #2392 from xfxyjwf/fixdown
...
Restore jenkins files.
8 years ago
Adam Cozzette
40f3586412
Fixed remaining JSPB test failures
8 years ago
Adam Cozzette
315350b2fa
Updated message_test.js so that it does not depend on fromObject
8 years ago
Adam Cozzette
b4dd686ab4
Updated enum names in test.proto to avoid conflicting with testbinary.proto
8 years ago
Julien Brianceau
a5c30ce623
C++: Fix use with GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER
...
Behavior of define GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER has been
altered between 337a028
and cc8ca5b
for C++.
See github issue #2385 for further details.
8 years ago
Feng Xiao
780793255d
Restore jenkins files.
...
The last up-integration from github to google3 was made at commit
e28286fa05
but somehow the change in
that commit is not actually in the up-integration CL and as a result
that change was reverted by the down-integration. Restoring them
should make the jenkins tests running again.
8 years ago
Feng Xiao
599613e4c4
Update EXTRA_DIST lists.
8 years ago
Feng Xiao
1f077a0183
Update conformance failure lists.
8 years ago
Feng Xiao
530ae302bd
Add back missing LIBPROTOBUF_EXPORT.
8 years ago
Adam Cozzette
1673389ef1
Updated libprotoc.cmake
8 years ago
Adam Cozzette
5d63097fc2
Merge branch 'master' into down-integrate-with-msvc-fix
8 years ago
Adam Cozzette
5a76e633ea
Integrated internal changes from Google
8 years ago
Adam Cozzette
cd315dcbad
Merge pull request #2383 from snapsam/patch-1
...
Update README.md
8 years ago
Adam Cozzette
44edefaef6
Merge pull request #2382 from zhsyourai/master
...
Add LL to large constant
8 years ago
Samuel Rossoff (of The Ebon Blade)
d571d39923
Update README.md
...
needed a grave here, not an apostrophy
8 years ago
zhsyourai
14c147ea79
Add LL to large constant
...
Some compiler will report: 'error: integer constant is too large for long type'
8 years ago
Paul Yang
99564c3347
Rename Empty to GPBEmpty in php generated file.
...
In php, class name cannot be "Empty". Modified code generator to (#2375 ) generate GPBEmpty instead (for google.protobuf.Empty only). Also change
runtime code to work with the new generated code accordingly.
8 years ago
Adam Cozzette
fc27ead107
Merge pull request #2362 from wujingchao/patch-1
...
Class is final but declares protected field
8 years ago
Adam Cozzette
a3dfbe6e52
Merge pull request #2378 from ianfhunter/patch-1
...
typo in readme
8 years ago
Adam Cozzette
01d321c2d6
Merge pull request #2367 from jbrianceau/add-missing-include-in-message-lite-cc
...
Add missing include in message_lite.cc
8 years ago
Ian Hunter
130bb0739a
typo
8 years ago
Feng Xiao
83d6411bf3
Fix jenkins tests.
8 years ago
Joshua Haberman
bf379715c9
Merge pull request #2323 from marcinwyszynski/master
...
More Ruby-eqsue interface
8 years ago
Joshua Haberman
c6f3d700b9
Merge pull request #1907 from evokly/js-utf8-fix
...
JS: Fix for high utf-8 codepoints.
8 years ago
Wojciech Mandrysz
bd850a25f5
JS: Well, this is the right place for surrogates.
8 years ago
Wojciech Mandrysz
292c2c91cf
JS: Re-added comment, moved surrogates code to the right place
8 years ago
Feng Xiao
6e93fa41c4
Merge pull request #2366 from jbrianceau/reland-fix-include-js-generator
...
Fix #include in js_generator.cc
8 years ago
Feng Xiao
a95d052bdb
Merge pull request #2368 from jbrianceau/fix-json-style-in-project-json
...
Fix csharp/src/Google.Protobuf.Test/project.json
8 years ago
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)
8 years ago
Julien Brianceau
aac9ed8e39
Add missing include in message_lite.cc
...
This changes fixes "use of undeclared identifier 'INT_MAX'"
compilation error.
8 years ago
Julien Brianceau
3316062e98
Fix #include in js_generator.cc
...
Reland commit f2885f6
that has been trampled by commit d64a2d99
.
8 years ago
Marcin Wyszynski
74a636a7a2
Move variable declarations before actual code
8 years ago
Joshua Haberman
0c0f7e2aa8
Merge pull request #2364 from haberman/jslicense
...
Fixed JavaScript license declaration.
8 years ago
Josh Haberman
5d9dbe3ecc
Fixed JavaScript license declaration.
8 years ago
wujingchao
abeff7b4fd
Class is final but declares protected field
...
This class is declared to be final, but declares fields to be protected. Since the class is final, it can not be derived from, and the use of protected is confusing.
8 years ago
Feng Xiao
a30e5af204
Merge pull request #2358 from ckennelly/master
...
Resolve old TODO for StringTypeHandler.
8 years ago
Chris Kennelly
e02cb2bb83
Resolve old TODO for StringTypeHandler.
...
StringSpaceUsedExcludingSelf has been part of the lite library since
b913cbd
.
8 years ago
Feng Xiao
8a4b2c573a
Merge pull request #2353 from guptasu/master
...
MessageOptions should handle both proto2 and google.protobuf package names.
8 years ago
Feng Xiao
df56736db9
Merge pull request #2357 from D3Hunter/master
...
#2356 : fix ExceptionInInitializerError on IBM J9
8 years ago