Commit graph

1019 commits

Author SHA1 Message Date
Bo Yang
e3f0689d05 Fix bugs for internal integration. 2016-10-10 11:23:36 -07:00
Bo Yang
cc8ca5b6a5 Integrate internal changes 2016-10-10 11:23:36 -07:00
Andy Hochhaus
b2b65842ea Silence compile warnings in bazel 2016-10-09 08:36:01 -07: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
Sergio Campama
1af7c4cb08 Fixes static analyzer issues from xcode. 2016-09-20 17:59:27 -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
78aee1b15f Merge pull request #2044 from wychen/Win32ANSI
Fix Win32 error messages on Unicode build
2016-09-09 16:46:50 -07:00
Feng Xiao
53387e5f55 Merge pull request #2090 from guoxiao/find
include std::find()
2016-09-09 12:44:34 -07: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
Sergio Campamá
14e74f6a21 Support the -Wassign-enum compiler flag. (#2085)
Support the -Wassign-enum compiler flag.
2016-09-08 15:15:12 -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
Khing
08b1c718e4 Fix #2032 unused parameter 'deterministic'
Parameter deterministic is unused in
InternalSerializeWithCachedSizesToArray(), which generates unused
parameter warning in every message.
2016-09-08 10:56:21 +10: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
Jisi Liu
a098e80933 Merge pull request #1862 from pherl/3.0.0-GA
Cherry pick c# changes from master
2016-09-02 11:36:30 -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
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
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
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
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
Thomas Van Lenten
290d26b462 Remove the compiler options from ImportWriter.
Breaks the tie of the ImportWriter to the ObjC generation, allow grpc to use
a different extension and to relay the values they need for these.

- Pass in the two framework options to the ctor.
- Pass in the header extension to AddFile.
2016-08-23 11:19:38 -04:00
Thomas Van Lenten
93362a5aa5 Move the ImportWriter into the ObjC Helpers.
grpc likely needs to provide the same sorta handling, so expose the class so
the logic can be reused.
2016-08-23 10:19:03 -04:00
Sergio Campamá
ff2a6600e5 Adds better support for protos without packages (#1979)
Adds better support for protos without packages and more warnings on possible improvements
2016-08-19 09:35:33 -04:00
Sergio Campamá
62f2ff86b5 Fixes extra whitespace on generated comments. (#1950)
Fixes extra whitespace on generated comments.
2016-08-17 10:50:58 -07:00
Sergio Campamá
a989501f47 Adds support for appledoc in generated code. (#1928)
Convert mapping of proto comments to appledoc format so they show up in Xcode and cocoadocs.

Fixes https://github.com/google/protobuf/issues/1866
2016-08-17 10:50:52 -07:00
Sergio Campamá
a2484208c3 Fixes extra whitespace on generated comments. (#1950)
Fixes extra whitespace on generated comments.
2016-08-12 14:44:03 -04:00
Sergio Campamá
237f321e33 Adds support for appledoc in generated code. (#1928)
Convert mapping of proto comments to appledoc format so they show up in Xcode and cocoadocs.

Fixes https://github.com/google/protobuf/issues/1866
2016-08-09 08:26:24 -04:00
Bryon Gloden, CISSP®
a375e1acfd close opened file descriptors properly 2016-08-05 17:30:19 -04:00
Feng Xiao
c59473d53e Merge pull request #1044 from mark-whiting/master
Adding missing generic gcc 64-bit atomicops.
2016-08-04 11:21:40 -07:00
Jisi Liu
cf42b608e0 Merge pull request #1905 from pherl/fixdoc
Add and fix C++ runtime docs
2016-08-02 12:46:00 -07:00
Jisi Liu
3916a0aa99 Add and fix C++ runtime docs 2016-08-02 10:13:05 -07:00
Jisi Liu
169d0ca43c Merge pull request #1893 from google/3.0.0-GA
Merge 3.0.0-GA into master
2016-07-29 14:27:53 -07:00
Clement Courbet
c466f4b539 Be consistent with the use of CHECK()/ GOOGLE_CHECK(). 2016-07-29 16:59:42 +02:00
Jisi Liu
e3fac65add Change the build.zip.sh to support lite 2016-07-28 14:24:05 -07:00