AuroraMiddleware/protobuf
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity
3,887 Commits 35 Branches 138 Tags 124 MiB
4f032cd9af
Commit Graph

3887 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Thomas Van Lenten
161b937740 Fix error and add note about lossy issues 2016-09-08 15:34:42 -04:00
Sergio Campamá
14e74f6a21 Support the -Wassign-enum compiler flag. (#2085) 
Support the -Wassign-enum compiler flag.
 2016-09-08 15:15:12 -04:00
Dave Protasowski
1fc416be21 Allow the JsonFormat.Parser to ignore unknown fields 
The default behaviour of throwing an exception remains
 2016-09-08 15:08:30 -04:00
Thomas Van Lenten
337ec3065f Add ObjC helpers for Any WKT. 
- Capture the ObjC prefix used when generating the the file.
- Track the containing type on descriptors.
- Mark descriptors where the message class name got a suffix added to it.
- Expose a fullName property on Descriptors.
- Add helpers for packing/unpacking Any messages.
- Bump the ObjC runtime version number. Since we added methods and invoke them
  in the generated code, ensure the code is running against a matching version.
  Otherwise, someone could compile against headers, but run with a framework
  that is older and get unknown selector failures.  This should trip clearer
  messaging.

Fixes https://github.com/google/protobuf/issues/1674
 2016-09-08 11:59:57 -04:00
Guo Xiao
82133ba00b include std::find() 2016-09-08 21:33:18 +08:00
Feng Xiao
4bc1657853 Merge pull request #2079 from khingblue/fix-generate-descriptor 
Fix #2071 replacing /bin/sh with bash when generates descriptor
 2016-09-07 14:56:31 -07:00
Khing
f9fc56c42a Fix #2071 replacing /bin/sh with bash 
On Ubuntu /bin/sh is dash by default, this can cause
generate_descriptor_proto.sh fail to execute.
 2016-09-07 14:46:50 +10:00
Joshua Haberman
74638a253e Merge pull request #2047 from jonathon-love/master 
Fix to typo/oversight in reflection tests
 2016-09-06 11:14:15 -07:00
Guillaume Turri
9b8da104c1 Rm check on dependency in the C# reflection API (#2051) 
This check adds a few constraints on the way to build a project when we have
a proto file which imports another one. In particular, on projects which
build both C# and Java, it's easy to end up with exceptions like

    Expected: included.proto but was src/main/protobuf/included.proto

A user may work around this issue, but it may add unnecessary constraints
on the layout of the project.

According to f3504cf3b1 (diff-ecb0b909ed572381a1c8d1994f09a948R309)
it has already been considered to get rid of this check, for
similar considerations, and because it doesn't exist in the Java code
 2016-09-05 09:29:03 +01:00
Feng Xiao
96a9d97352 Merge pull request #2059 from chih-hung/master 
Fix #1955 clang-tidy warning misc-macro-parentheses
 2016-09-02 15:38:03 -07:00
Chih-Hung Hsieh
7c3f7c6a09 Fix #1955 clang-tidy warning misc-macro-parentheses 
clang-tidy gives warning "macro argument should be enclosed in
parentheses" to macro ZR_, the "first" parameter.
 2016-09-02 15:28:42 -07:00
Feng Xiao
fa6428ed2a Merge pull request #2045 from mike07026/master 
fix #1342 cause by ownership issues
 2016-09-02 11:01:05 -07:00
Thomas Van Lenten
85c1adf9f9 Merge pull request #2053 from thomasvl/improve_root_registry_wiring 
Make Root's +extensionRegistry generation smarter.
 2016-09-02 10:11:07 -04:00
Jonathon Love
64958cdb1d Fix to typo/oversight in python tests 
Fix to typo/oversight in python tests, only affecting python 3
 2016-09-02 12:36:11 +10:00
Wei-Yin Chen (陳威尹)
a7eaf36967 Rename UNICODE to protobuf_UNICODE 2016-09-01 17:18:22 -07:00
Thomas Van Lenten
13a41246dd Make Root's +extensionRegistry generation smarter. 
At generation time, walk the file's dependencies to see what really contains
extensions so we can generate more minimal code that only links together the
roots that provided extensions. Gets a bunch of otherwise noop code out of
the call flow when the roots are +initialized.
 2016-09-01 18:08:59 -04:00
Jisi Liu
d00cab0f8c Merge pull request #2039 from khingblue/remove-unused-vector 
Remove unused vector
 2016-09-01 09:17:43 -07:00
mike07026
df6088a7e8 detect invaild JSON encoding in bytes field 2016-09-01 20:08:45 +08:00
mike07026
5a17660ca0 detect invaild JSON encoding in bytes field 2016-09-01 20:06:55 +08:00
mike07026
e514f232a0 fix #1342 cause by ownership issues 2016-09-01 09:04:24 +08:00
Wei-Yin Chen (陳威尹)
48811b2edd Fix Win32ErrorMessage on Unicode build 2016-08-31 17:28:51 -07:00
Wei-Yin Chen (陳威尹)
11d6cb56d0 Add test for Win32ErrorMessage 2016-08-31 17:28:51 -07:00
Wei-Yin Chen (陳威尹)
588a803d58 Support Unicode build on Windows 2016-08-31 17:28:51 -07:00
Feng Xiao
b9649765f8 Merge pull request #2024 from pstavirs/master 
Restore New*Callback into google::protobuf namespace …
 2016-08-31 11:39:38 -07:00
Khing
8ee6f568ea Remove unused vector 2016-08-31 15:12:32 +10:00
Feng Xiao
c0a6a6b462 Merge pull request #2033 from frett/osgiExport 
update the OSGi metadata for the javanano package
 2016-08-30 10:31:45 -07:00
Daniel Frett
b6dec9b8d4 update the OSGi SymbolicName and ExportedPackage for the javanano library 2016-08-30 13:16:55 -04:00
Thomas Van Lenten
8c93606357 Merge pull request #2031 from thomasvl/dont_require_filegenerators 
Speed up ObjC Generation with large dependency trees
 2016-08-30 12:19:40 -04:00
Thomas Van Lenten
78a6d310de Speed up ObjC Generation with large dependency trees 
Don't create FileGenerators for each dep. FileGenerators will deeply create all
the message, enum, and field generators; but those aren't needed when doing
the imports for dependencies. Instead directly generate the imports off the
FileDescriptors so no extra objects are created. The only other use was when
chaining together the *Roots for the file extension registry, but that also
can be generate off the name of the FileDescriptor directly.
 2016-08-30 10:51:59 -04:00
Joshua Haberman
e721ce66cf Merge pull request #2012 from haberman/rubymapgcfix 
Ruby: make sure map parsing frames are GC-rooted.
 2016-08-29 17:05:43 -07:00
Josh Haberman
3a674ffe05 upb bugfix: JSON map entry keys were passing the wrong closure. 2016-08-29 15:28:59 -07:00
Srivats P
eedc7be680 Restore New*Callback into google::protobuf namespace since these are used by the service stubs code 
Fixes #1966
 2016-08-29 22:57:46 +05:30
Joshua Haberman
7e627738b3 Merge pull request #1920 from gegles/master 
Fix missing import of jspb.Map (#1885)
 2016-08-29 10:07:25 -07:00
Thomas Van Lenten
c32b9dd474 Merge pull request #2018 from thomasvl/support_generate_all 
ObjC support for GenerateAll().
 2016-08-29 11:55:08 -04:00
Thomas Van Lenten
2e66a61b54 Support GenerateAll(). 
- Expect calls on GenerateAll() and not Generate().
- Parse the prefix validation file once, and then check all the files.
 2016-08-26 13:54:00 -04:00
Josh Haberman
d4213d839f Ruby: make sure map parsing frames are GC-rooted. 2016-08-26 09:03:55 -07:00
Feng Xiao
3d9d1a1255 Merge pull request #2013 from xfxyjwf/gmock 
Update gmock links.
 2016-08-25 20:09:20 -07:00
Feng Xiao
c4a84abcb6 Update links in appveyor.yml 
Change-Id: I3d44e3c6877e00cfea5a903568fde1e6f597aac1
 2016-08-25 14:34:45 -07:00
Feng Xiao
bba446bbf2 Update gmock links. 
The original link is no longer available.

Change-Id: I2976d3f19c8e818689549fb31ff20af8eae92a07
 2016-08-25 14:28:59 -07:00