diff options
| author |  Stefan Miller <stefanamiller@google.com> | 2019-10-11 10:30:54 -0700 |
|---|---|---|
| committer |  Thomas Van Lenten <thomasvl@google.com> | 2019-10-11 14:39:22 -0400 |
| commit | e0550a8f4301c92e55bc0495229bf0502138fb96 (patch) | |
| tree | 7c95c5e39197948e2f15d51d060fdc54b97067f9 | |
| parent | 7d49314feeab0a4c96abd6c6b704d445899f1fa5 (diff) | |
GTMStringEncoding: Mark deprecated methods to fix parameters in Swift.
Fixes the auto-generated interface methods for the desired methods. The deprecated methods were causing conflicts in the generated interface of the newer methods that would add a zero-length tuple parameter.
Example of fix for encode:error:
Interface Before:
open func encode(_ data: Data!, error: ()) throws -> String
Interface After:
open func encode(_ data: Data!) throws -> String
| -rw-r--r-- | Foundation/GTMStringEncoding.h | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/Foundation/GTMStringEncoding.h b/Foundation/GTMStringEncoding.h index 24fa0bc..cae08f0 100644 --- a/Foundation/GTMStringEncoding.h +++ b/Foundation/GTMStringEncoding.h @@ -78,15 +78,19 @@ - (void)setPaddingChar:(char)c; // Encode a raw binary buffer to a 7-bit ASCII string. -- (NSString *)encode:(NSData *)data __attribute__((deprecated("Use encode:error:"))); -- (NSString *)encodeString:(NSString *)string __attribute__((deprecated("Use encodeString:error:"))); +- (NSString *)encode:(NSData *)data __attribute__((deprecated("Use encode:error:"))) + NS_SWIFT_UNAVAILABLE("Use encode:error: mapped to encode(_ data:) throws"); +- (NSString *)encodeString:(NSString *)string __attribute__((deprecated("Use encodeString:error:"))) + NS_SWIFT_UNAVAILABLE("Use encode:error: mapped to encode(_ string:) throws"); - (NSString *)encode:(NSData *)data error:(NSError **)error; - (NSString *)encodeString:(NSString *)string error:(NSError **)error; // Decode a 7-bit ASCII string to a raw binary buffer. -- (NSData *)decode:(NSString *)string __attribute__((deprecated("Use decode:error:"))); -- (NSString *)stringByDecoding:(NSString *)string __attribute__((deprecated("Use stringByDecoding:error:"))); +- (NSData *)decode:(NSString *)string __attribute__((deprecated("Use decode:error:"))) + NS_SWIFT_UNAVAILABLE("Use decode:error: mapped to decode(_ string:) throws"); +- (NSString *)stringByDecoding:(NSString *)string __attribute__((deprecated("Use stringByDecoding:error:"))) + NS_SWIFT_UNAVAILABLE("Use stringByDecoding:error: mapped to string(byDecoding string:) throws"); - (NSData *)decode:(NSString *)string error:(NSError **)error; - (NSString *)stringByDecoding:(NSString *)string error:(NSError **)error; |