diff options
Diffstat (limited to 'objective-c/include/objc')
27 files changed, 119 insertions, 316 deletions
diff --git a/objective-c/include/objc/Glacier2.h b/objective-c/include/objc/Glacier2.h index 7eb7856ce58..a5d10e02900 100644 --- a/objective-c/include/objc/Glacier2.h +++ b/objective-c/include/objc/Glacier2.h @@ -7,4 +7,4 @@ // // ********************************************************************** -#import "Glacier2/Glacier2.h" +#import <objc/Glacier2/Glacier2.h> diff --git a/objective-c/include/objc/Glacier2/.gitignore b/objective-c/include/objc/Glacier2/.gitignore deleted file mode 100644 index 382c7a11d64..00000000000 --- a/objective-c/include/objc/Glacier2/.gitignore +++ /dev/null @@ -1,10 +0,0 @@ -// Generated by makegitignore.py - -// IMPORTANT: Do not edit this file -- any edits made here will be lost! -Metrics.h -PermissionsVerifierF.h -PermissionsVerifier.h -Router.h -RouterF.h -Session.h -SSLInfo.h diff --git a/objective-c/include/objc/Glacier2/Makefile b/objective-c/include/objc/Glacier2/Makefile deleted file mode 100644 index 8ed5f3157c5..00000000000 --- a/objective-c/include/objc/Glacier2/Makefile +++ /dev/null @@ -1,26 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ../../.. - -include $(top_srcdir)/config/Make.rules - -install:: - @if test ! -d $(DESTDIR)$(install_includedir)/Glacier2 ; \ - then \ - echo "Creating $(DESTDIR)$(install_includedir)/Glacier2..." ; \ - $(call mkdir,$(DESTDIR)$(install_includedir)/Glacier2) ; \ - fi - - @for i in *.h ; \ - do \ - echo "Installing $$i" ; \ - $(INSTALL_DATA) $$i $(DESTDIR)$(install_includedir)/Glacier2/$$i ; \ - chmod a+r $(DESTDIR)$(install_includedir)/Glacier2/$$i ; \ - done diff --git a/objective-c/include/objc/Ice.h b/objective-c/include/objc/Ice.h index 1584f9315d6..ae9c3375d33 100644 --- a/objective-c/include/objc/Ice.h +++ b/objective-c/include/objc/Ice.h @@ -7,4 +7,4 @@ // // ********************************************************************** -#import "Ice/Ice.h" +#import <objc/Ice/Ice.h> diff --git a/objective-c/include/objc/Ice/.gitignore b/objective-c/include/objc/Ice/.gitignore deleted file mode 100644 index 9be90a78435..00000000000 --- a/objective-c/include/objc/Ice/.gitignore +++ /dev/null @@ -1,39 +0,0 @@ -// Generated by makegitignore.py - -// IMPORTANT: Do not edit this file -- any edits made here will be lost! -BuiltinSequences.h -Communicator.h -CommunicatorF.h -Connection.h -ConnectionF.h -Current.h -Endpoint.h -EndpointF.h -EndpointTypes.h -FacetMap.h -Identity.h -InstrumentationF.h -ImplicitContext.h -ImplicitContextF.h -Locator.h -LocatorF.h -LocalException.h -Logger.h -LoggerF.h -Metrics.h -ObjectAdapter.h -ObjectAdapterF.h -ObjectFactoryF.h -PluginF.h -Process.h -ProcessF.h -Properties.h -PropertiesF.h -PropertiesAdmin.h -RemoteLogger.h -Router.h -RouterF.h -ServantLocator.h -ServantLocatorF.h -SliceChecksumDict.h -Version.h diff --git a/objective-c/include/objc/Ice/Config.h b/objective-c/include/objc/Ice/Config.h index aa84d33e780..98efccf4531 100644 --- a/objective-c/include/objc/Ice/Config.h +++ b/objective-c/include/objc/Ice/Config.h @@ -19,16 +19,34 @@ #import <stdlib.h> +// +// Use system headers as preferred way to detect 32 or 64 bit mode and +// fallback to architecture based checks +// +#include <stdint.h> + +#if defined(__WORDSIZE) && (__WORDSIZE == 64) +# define ICE_64 +#elif defined(__WORDSIZE) && (__WORDSIZE == 32) +# define ICE_32 +#elif defined(__APPLE__) && (defined(__x86_64) || defined(__arm64)) +# define ICE_64 +#else +# define ICE_32 +#endif + #define ICE_DEPRECATED_API(msg) __attribute__((deprecated(msg))) #define ICE_DECLSPEC_EXPORT __attribute__((visibility ("default"))) #define ICE_DECLSPEC_IMPORT __attribute__((visibility ("default"))) #ifndef ICE_API -# ifdef ICE_API_EXPORTS +# if defined(ICE_STATIC_LIBS) +# define ICE_API /**/ +# elif defined(ICE_API_EXPORTS) # define ICE_API ICE_DECLSPEC_EXPORT -# else +# else # define ICE_API ICE_DECLSPEC_IMPORT -# endif +# endif #endif // @@ -38,7 +56,7 @@ typedef unsigned char ICEByte; typedef short ICEShort; typedef int ICEInt; -#if defined(__x86_64) || defined(__arm64) +#if defined(ICE_64) typedef long ICELong; #else typedef long long ICELong; diff --git a/objective-c/include/objc/Ice/DispatchInterceptor.h b/objective-c/include/objc/Ice/DispatchInterceptor.h index 48ef2cf0cc4..97a86906c13 100644 --- a/objective-c/include/objc/Ice/DispatchInterceptor.h +++ b/objective-c/include/objc/Ice/DispatchInterceptor.h @@ -10,7 +10,7 @@ #import <objc/Ice/Object.h> ICE_API @protocol ICEDispatchInterceptor <ICEObject> --(BOOL) dispatch:(id<ICERequest>)request; +-(void) dispatch:(id<ICERequest>)request; @end ICE_API @interface ICEDispatchInterceptor : ICEServant diff --git a/objective-c/include/objc/Ice/Exception.h b/objective-c/include/objc/Ice/Exception.h index 2529ef2446b..18d50d9ffbd 100644 --- a/objective-c/include/objc/Ice/Exception.h +++ b/objective-c/include/objc/Ice/Exception.h @@ -13,14 +13,15 @@ // // Forward declarations -// +// @protocol ICEOutputStream; @protocol ICEInputStream; @class NSCoder; ICE_API @interface ICEException : NSException --(NSString*)ice_name; +-(NSString*)ice_name ICE_DEPRECATED_API("ice_name() is deprecated use ice_id() instead."); +-(NSString*)ice_id; @end ICE_API @interface ICELocalException : ICEException @@ -39,9 +40,9 @@ ICE_API @interface ICELocalException : ICEException @end ICE_API @interface ICEUserException : ICEException --(BOOL)usesClasses__; --(void)write__:(id<ICEOutputStream>)stream; --(void) writeImpl__:(id<ICEOutputStream>)os; --(void)read__:(id<ICEInputStream>)stream; --(void) readImpl__:(id<ICEInputStream>)is; +-(BOOL)iceUsesClasses; +-(void)iceWrite:(id<ICEOutputStream>)stream; +-(void) iceWriteImpl:(id<ICEOutputStream>)os; +-(void)iceRead:(id<ICEInputStream>)stream; +-(void) iceReadImpl:(id<ICEInputStream>)is; @end diff --git a/objective-c/include/objc/Ice/Initialize.h b/objective-c/include/objc/Ice/Initialize.h index be265b2599f..53cc7006e2c 100644 --- a/objective-c/include/objc/Ice/Initialize.h +++ b/objective-c/include/objc/Ice/Initialize.h @@ -38,13 +38,13 @@ ICE_API @interface ICEInitializationData : NSObject id<ICELogger> logger; void(^dispatcher)(id<ICEDispatcherCall>, id<ICEConnection>); void(^batchRequestInterceptor)(id<ICEBatchRequest>, int, int); - NSDictionary* prefixTable__; + NSDictionary* prefixTable_; } @property(retain, nonatomic) id<ICEProperties> properties; @property(retain, nonatomic) id<ICELogger> logger; @property(copy, nonatomic) void(^dispatcher)(id<ICEDispatcherCall>, id<ICEConnection>); @property(copy, nonatomic) void(^batchRequestInterceptor)(id<ICEBatchRequest>, int, int); -@property(retain, nonatomic) NSDictionary* prefixTable__; +@property(retain, nonatomic) NSDictionary* prefixTable_; -(id) init:(id<ICEProperties>)properties logger:(id<ICELogger>)logger dispatcher:(void(^)(id<ICEDispatcherCall>, id<ICEConnection>))d; @@ -71,14 +71,13 @@ ICE_API @interface ICEUtil : NSObject +(id<ICECommunicator>) createCommunicator:(int*)argc argv:(char*[])argv initData:(ICEInitializationData *)initData; +(id<ICEInputStream>) createInputStream:(id<ICECommunicator>)communicator data:(NSData*)data; +(id<ICEInputStream>) createInputStream:(id<ICECommunicator>)c data:(NSData*)data encoding:(ICEEncodingVersion*)e; -+(id<ICEInputStream>) wrapInputStream:(id<ICECommunicator>)communicator data:(NSData*)data; -+(id<ICEInputStream>) wrapInputStream:(id<ICECommunicator>)c data:(NSData*)data encoding:(ICEEncodingVersion*)e; +(id<ICEOutputStream>) createOutputStream:(id<ICECommunicator>)communicator; +(id<ICEOutputStream>) createOutputStream:(id<ICECommunicator>)c encoding:(ICEEncodingVersion*)e; +(NSString*) generateUUID; +(NSArray*)argsToStringSeq:(int)argc argv:(char*[])argv; +(void)stringSeqToArgs:(NSArray*)args argc:(int*)argc argv:(char*[])argv; +(ICEIdentity*) stringToIdentity:(NSString*)str; ++(NSMutableString*) identityToString:(ICEIdentity*)ident toStringMode:(ICEToStringMode)toStringMode; +(NSMutableString*) identityToString:(ICEIdentity*)ident; @end @@ -89,3 +88,10 @@ ICE_API @interface ICEUtil : NSObject @interface ICEProtocolVersion(StringConv) +(ICEProtocolVersion*) protocolVersionWithString:(NSString*)str; @end + +extern void ICEregisterIceSSL(BOOL); +extern void ICEregisterIceDiscovery(BOOL); +extern void ICEregisterIceLocatorDiscovery(BOOL); +#if defined(__APPLE__) && TARGET_OS_IPHONE > 0 +extern void ICEregisterIceIAP(BOOL); +#endif diff --git a/objective-c/include/objc/Ice/Makefile b/objective-c/include/objc/Ice/Makefile deleted file mode 100644 index cab92cc20c7..00000000000 --- a/objective-c/include/objc/Ice/Makefile +++ /dev/null @@ -1,26 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ../../.. - -include $(top_srcdir)/config/Make.rules - -install:: - @if test ! -d $(DESTDIR)$(install_includedir)/Ice ; \ - then \ - echo "Creating $(DESTDIR)$(install_includedir)/Ice..." ; \ - $(call mkdir,$(DESTDIR)$(install_includedir)/Ice) ; \ - fi - - @for i in *.h ; \ - do \ - echo "Installing $$i" ; \ - $(INSTALL_DATA) $$i $(DESTDIR)$(install_includedir)/Ice/$$i ; \ - chmod a+r $(DESTDIR)$(install_includedir)/Ice/$$i ; \ - done diff --git a/objective-c/include/objc/Ice/Object.h b/objective-c/include/objc/Ice/Object.h index a6904dfd05a..8ae9ad8f17f 100644 --- a/objective-c/include/objc/Ice/Object.h +++ b/objective-c/include/objc/Ice/Object.h @@ -39,7 +39,7 @@ ICE_API @protocol ICEObject <NSObject> -(NSArray*) ice_ids:(ICECurrent*)current; -(void) ice_preMarshal; -(void) ice_postUnmarshal; --(BOOL) ice_dispatch:(id<ICERequest>)request; +-(void) ice_dispatch:(id<ICERequest>)request; @end ICE_API @interface ICEObject : NSObject<ICEObject, NSCopying> @@ -47,28 +47,28 @@ ICE_API @interface ICEObject : NSObject<ICEObject, NSCopying> -(void) ice_ping; -(NSString*) ice_id; -(NSArray*) ice_ids; --(BOOL) ice_dispatch:(id<ICERequest>)request; +-(void) ice_dispatch:(id<ICERequest>)request; +(NSString*) ice_staticId; -+(NSString*const*) staticIds__:(int*)count idIndex:(int*)idx; --(void) write__:(id<ICEOutputStream>)os; --(void) read__:(id<ICEInputStream>)is; ++(NSString*const*) iceStaticIds:(int*)count idIndex:(int*)idx; +-(void) iceWrite:(id<ICEOutputStream>)os; +-(void) iceRead:(id<ICEInputStream>)is; @end ICE_API @interface ICEServant : ICEObject { - void* object__; - id delegate__; + void* iceObject_; + id iceDelegate_; } -(id) initWithDelegate:(id)delegate; +(id) objectWithDelegate:(id)delegate; -+(BOOL) ice_isA___:(id)servant current:(ICECurrent*)current is:(id<ICEInputStream>)is os:(id<ICEOutputStream>)os; -+(BOOL) ice_ping___:(id)servant current:(ICECurrent*)current is:(id<ICEInputStream>)is os:(id<ICEOutputStream>)os; -+(BOOL) ice_id___:(id)servant current:(ICECurrent*)current is:(id<ICEInputStream>)is os:(id<ICEOutputStream>)os; -+(BOOL) ice_ids___:(id)servant current:(ICECurrent*)current is:(id<ICEInputStream>)is os:(id<ICEOutputStream>)os; --(BOOL) dispatch__:(ICECurrent*)current is:(id<ICEInputStream>)is os:(id<ICEOutputStream>)os; --(void) writeImpl__:(id<ICEOutputStream>)os; --(void) readImpl__:(id<ICEInputStream>)is; --(id) target__; ++(void) iceD_ice_isA:(id)servant current:(ICECurrent*)current is:(id<ICEInputStream>)is os:(id<ICEOutputStream>)os; ++(void) iceD_ice_ping:(id)servant current:(ICECurrent*)current is:(id<ICEInputStream>)is os:(id<ICEOutputStream>)os; ++(void) iceD_ice_id:(id)servant current:(ICECurrent*)current is:(id<ICEInputStream>)is os:(id<ICEOutputStream>)os; ++(void) iceD_ice_ids:(id)servant current:(ICECurrent*)current is:(id<ICEInputStream>)is os:(id<ICEOutputStream>)os; +-(void) iceDispatch:(ICECurrent*)current is:(id<ICEInputStream>)is os:(id<ICEOutputStream>)os; +-(void) iceWriteImpl:(id<ICEOutputStream>)os; +-(void) iceReadImpl:(id<ICEInputStream>)is; +-(id) iceTarget; @end ICE_API @protocol ICEBlobject<ICEObject> diff --git a/objective-c/include/objc/Ice/ObjectFactory.h b/objective-c/include/objc/Ice/ObjectFactory.h index d622453944c..74bad6cde75 100644 --- a/objective-c/include/objc/Ice/ObjectFactory.h +++ b/objective-c/include/objc/Ice/ObjectFactory.h @@ -13,4 +13,3 @@ ICE_API @protocol ICEObjectFactory <NSObject> -(ICEObject*) create:(NSString*)sliceId NS_RETURNS_RETAINED; -(void) destroy; @end - diff --git a/objective-c/include/objc/Ice/Proxy.h b/objective-c/include/objc/Ice/Proxy.h index 83fa6e93e10..79dbf98eecb 100644 --- a/objective-c/include/objc/Ice/Proxy.h +++ b/objective-c/include/objc/Ice/Proxy.h @@ -162,8 +162,8 @@ ICE_API @protocol ICEObjectPrx <NSObject, NSCopying> ICE_API @interface ICEObjectPrx : NSObject<ICEObjectPrx> { - void* objectPrx__; - id<ICECommunicator> communicator__; + void* objectPrx_; + id<ICECommunicator> communicator_; } +(id) uncheckedCast:(id<ICEObjectPrx>)proxy; +(id) uncheckedCast:(id<ICEObjectPrx>)proxy facet:(NSString*)facet; @@ -173,19 +173,19 @@ ICE_API @interface ICEObjectPrx : NSObject<ICEObjectPrx> +(id) checkedCast:(id<ICEObjectPrx>)proxy facet:(NSString*)facet context:(ICEContext*)context; +(NSString*) ice_staticId; -+(Protocol*) protocol__; --(id<ICEOutputStream>) createOutputStream__; --(void) invoke__:(NSString*)operation mode:(ICEOperationMode)mode format:(ICEFormatType)format marshal:(ICEMarshalCB)marshal - unmarshal:(ICEUnmarshalCB)unmarshal context:(ICEContext*)context; --(id<ICEAsyncResult>) begin_invoke__:(NSString*)operation mode:(ICEOperationMode)mode format:(ICEFormatType)format marshal:(ICEMarshalCB)marshal - returnsData:(BOOL)returnsData context:(ICEContext*)context; --(id<ICEAsyncResult>) begin_invoke__:(NSString*)operation mode:(ICEOperationMode)mode format:(ICEFormatType)format marshal:(ICEMarshalCB)marshal - response:(void(^)())response - exception:(void(^)(ICEException*))exception sent:(void(^)(BOOL))sent ++(Protocol*) iceProtocol; +-(id<ICEOutputStream>) iceCreateOutputStream; +-(void) iceInvoke:(NSString*)operation mode:(ICEOperationMode)mode format:(ICEFormatType)format marshal:(ICEMarshalCB)marshal + unmarshal:(ICEUnmarshalCB)unmarshal context:(ICEContext*)context; +-(id<ICEAsyncResult>) iceI_begin_invoke:(NSString*)operation mode:(ICEOperationMode)mode format:(ICEFormatType)format marshal:(ICEMarshalCB)marshal + returnsData:(BOOL)returnsData context:(ICEContext*)context; +-(id<ICEAsyncResult>) iceI_begin_invoke:(NSString*)operation mode:(ICEOperationMode)mode format:(ICEFormatType)format marshal:(ICEMarshalCB)marshal + response:(void(^)())response + exception:(void(^)(ICEException*))exception sent:(void(^)(BOOL))sent context:(ICEContext*)context; --(id<ICEAsyncResult>) begin_invoke__:(NSString*)operation mode:(ICEOperationMode)mode format:(ICEFormatType)format marshal:(ICEMarshalCB)marshal - completed:(void(^)(id<ICEInputStream>, BOOL))completed - response:(BOOL)response exception:(void(^)(ICEException*))exception sent:(void(^)(BOOL))sent - context:(ICEContext*)context; --(void)end_invoke__:(NSString*)operation unmarshal:(ICEUnmarshalCB)unmarshal result:(id<ICEAsyncResult>)result; +-(id<ICEAsyncResult>) iceI_begin_invoke:(NSString*)operation mode:(ICEOperationMode)mode format:(ICEFormatType)format marshal:(ICEMarshalCB)marshal + completed:(void(^)(id<ICEInputStream>, BOOL))completed + response:(BOOL)response exception:(void(^)(ICEException*))exception sent:(void(^)(BOOL))sent + context:(ICEContext*)context; +-(void)iceI_end_invoke:(NSString*)operation unmarshal:(ICEUnmarshalCB)unmarshal result:(id<ICEAsyncResult>)result; @end diff --git a/objective-c/include/objc/Ice/SlicedData.h b/objective-c/include/objc/Ice/SlicedData.h index 5e1c0ef251f..1dacba245c9 100644 --- a/objective-c/include/objc/Ice/SlicedData.h +++ b/objective-c/include/objc/Ice/SlicedData.h @@ -14,7 +14,7 @@ ICE_API @protocol ICESlicedData<NSObject> @end -ICE_API @interface ICEUnknownSlicedObject : ICEObject +ICE_API @interface ICEUnknownSlicedValue : ICEObject { @private NSString* unknownTypeId_; diff --git a/objective-c/include/objc/Ice/Stream.h b/objective-c/include/objc/Ice/Stream.h index 113b681087d..b02cc74bd55 100644 --- a/objective-c/include/objc/Ice/Stream.h +++ b/objective-c/include/objc/Ice/Stream.h @@ -17,7 +17,6 @@ // @class ICEObject; @protocol ICEObjectPrx; -@protocol ICECommunicator; @protocol ICESlicedData; @class ICEUserException; @class ICEEncodingVersion; @@ -54,9 +53,7 @@ typedef struct ICE_API @protocol ICEInputStream <NSObject> --(id<ICECommunicator>) communicator; - --(void) sliceObjects:(BOOL)b; +-(void) setSliceValues:(BOOL)b; -(BOOL) readBool; -(NSMutableData*) newBoolSeq; @@ -99,14 +96,14 @@ ICE_API @protocol ICEInputStream <NSObject> -(id<ICEObjectPrx>) newProxy:(Class)c; -(id<ICEObjectPrx>) readProxy:(Class)c; --(void) newObject:(ICEObject*ICE_STRONG_QUALIFIER*)object; --(void) newObject:(ICEObject*ICE_STRONG_QUALIFIER*)object expectedType:(Class)type; --(void) readObject:(ICEObject**)object; --(void) readObject:(ICEObject**)object expectedType:(Class)type; --(NSMutableArray*) newObjectSeq:(Class)expectedType; --(NSMutableArray*) readObjectSeq:(Class)expectedType; --(NSMutableDictionary*) newObjectDict:(Class)keyType expectedType:(Class)type; --(NSMutableDictionary*) readObjectDict:(Class)keyType expectedType:(Class)type; +-(void) newValue:(ICEObject*ICE_STRONG_QUALIFIER*)object; +-(void) newValue:(ICEObject*ICE_STRONG_QUALIFIER*)object expectedType:(Class)type; +-(void) readValue:(ICEObject**)object; +-(void) readValue:(ICEObject**)object expectedType:(Class)type; +-(NSMutableArray*) newValueSeq:(Class)expectedType; +-(NSMutableArray*) readValueSeq:(Class)expectedType; +-(NSMutableDictionary*) newValueDict:(Class)keyType expectedType:(Class)type; +-(NSMutableDictionary*) readValueDict:(Class)keyType expectedType:(Class)type; -(NSMutableArray*) newSequence:(Class)type; -(NSMutableArray*) readSequence:(Class)type; @@ -120,8 +117,8 @@ ICE_API @protocol ICEInputStream <NSObject> -(void) throwException; --(void) startObject; --(id<ICESlicedData>) endObject:(BOOL)preserve NS_RETURNS_RETAINED; +-(void) startValue; +-(id<ICESlicedData>) endValue:(BOOL)preserve NS_RETURNS_RETAINED; -(void) startException; -(id<ICESlicedData>) endException:(BOOL)preserve NS_RETURNS_RETAINED; @@ -132,11 +129,12 @@ ICE_API @protocol ICEInputStream <NSObject> -(ICEEncodingVersion*) startEncapsulation; -(void) endEncapsulation; +-(ICEEncodingVersion*) skipEmptyEncapsulation; -(ICEEncodingVersion*) skipEncapsulation; -(ICEEncodingVersion*) getEncoding; --(void) readPendingObjects; +-(void) readPendingValues; -(void) rewind; @@ -146,8 +144,6 @@ ICE_API @protocol ICEInputStream <NSObject> ICE_API @protocol ICEOutputStream <NSObject> --(id<ICECommunicator>) communicator; - -(void) writeBool:(BOOL)v; -(void) writeBoolSeq:(NSData*)v; @@ -177,9 +173,9 @@ ICE_API @protocol ICEOutputStream <NSObject> -(void) writeProxy:(id<ICEObjectPrx>)v; --(void) writeObject:(ICEObject*)v; --(void) writeObjectSeq:(NSArray*)v; --(void) writeObjectDict:(NSDictionary*)v helper:(Class)helper; +-(void) writeValue:(ICEObject*)v; +-(void) writeValueSeq:(NSArray*)v; +-(void) writeValueDict:(NSDictionary*)v helper:(Class)helper; -(void) writeSequence:(NSArray*)arr helper:(Class)helper; -(void) writeDictionary:(NSDictionary*)dictionary helper:(ICEKeyValueTypeHelper)helper; @@ -190,8 +186,8 @@ ICE_API @protocol ICEOutputStream <NSObject> -(void) writeException:(ICEUserException*)v; --(void) startObject:(id<ICESlicedData>)slicedData; --(void) endObject; +-(void) startValue:(id<ICESlicedData>)slicedData; +-(void) endValue; -(void) startException:(id<ICESlicedData>)slicedData; -(void) endException; @@ -205,7 +201,7 @@ ICE_API @protocol ICEOutputStream <NSObject> -(ICEEncodingVersion*) getEncoding; --(void) writePendingObjects; +-(void) writePendingValues; -(NSMutableData*) finished; -(NSData*) finishedNoCopy; @@ -221,9 +217,9 @@ ICE_API @protocol ICEStreamHelper +(id) readRetained:(id<ICEInputStream>)stream NS_RETURNS_RETAINED; +(id) read:(id<ICEInputStream>)stream; +(void) write:(id)obj stream:(id<ICEOutputStream>)stream; -+(id) readOptRetained:(id<ICEInputStream>)stream tag:(ICEInt)tag; -+(id) readOpt:(id<ICEInputStream>)stream tag:(ICEInt)tag; -+(void) writeOpt:(id)obj stream:(id<ICEOutputStream>)stream tag:(ICEInt)tag; ++(id) readOptionalRetained:(id<ICEInputStream>)stream tag:(ICEInt)tag; ++(id) readOptional:(id<ICEInputStream>)stream tag:(ICEInt)tag; ++(void) writeOptional:(id)obj stream:(id<ICEOutputStream>)stream tag:(ICEInt)tag; +(ICEInt) minWireSize; @end @@ -259,7 +255,7 @@ ICE_API @interface ICEStringHelper : ICEStreamHelper ICE_API @interface ICEObjectHelper : ICEStreamHelper +(void)read:(ICEObject**)v stream:(id<ICEInputStream>)stream; -+(void)readOpt:(id*)v stream:(id<ICEInputStream>)stream tag:(ICEInt)tag; ++(void)readOptional:(id*)v stream:(id<ICEInputStream>)stream tag:(ICEInt)tag; @end ICE_API @interface ICEProxyHelper : ICEStreamHelper diff --git a/objective-c/include/objc/Ice/ValueFactory.h b/objective-c/include/objc/Ice/ValueFactory.h new file mode 100644 index 00000000000..7022a2b0f4e --- /dev/null +++ b/objective-c/include/objc/Ice/ValueFactory.h @@ -0,0 +1,18 @@ +// ********************************************************************** +// +// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. +// +// This copy of Ice is licensed to you under the terms described in the +// ICE_LICENSE file included in this distribution. +// +// ********************************************************************** + +#import <objc/Ice/Config.h> +#import <objc/Ice/Object.h> + +typedef ICEObject* (^ICEValueFactory)(NSString*); + +ICE_API @protocol ICEValueFactoryManager <NSObject> +-(void) add:(ICEValueFactory)factory sliceId:(NSString*)id_; +-(ICEValueFactory) find:(NSString*)id_; +@end diff --git a/objective-c/include/objc/IceGrid.h b/objective-c/include/objc/IceGrid.h index a1b6737bb82..83056e2bd43 100644 --- a/objective-c/include/objc/IceGrid.h +++ b/objective-c/include/objc/IceGrid.h @@ -7,4 +7,4 @@ // // ********************************************************************** -#import "IceGrid/IceGrid.h" +#import <objc/IceGrid/IceGrid.h> diff --git a/objective-c/include/objc/IceGrid/.gitignore b/objective-c/include/objc/IceGrid/.gitignore deleted file mode 100644 index 9d13a816fbf..00000000000 --- a/objective-c/include/objc/IceGrid/.gitignore +++ /dev/null @@ -1,14 +0,0 @@ -// Generated by makegitignore.py - -// IMPORTANT: Do not edit this file -- any edits made here will be lost! -Admin.h -Descriptor.h -Exception.h -FileParser.h -Locator.h -Observer.h -PluginFacade.h -Query.h -Registry.h -Session.h -UserAccountMapper.h diff --git a/objective-c/include/objc/IceGrid/IceGrid.h b/objective-c/include/objc/IceGrid/IceGrid.h index 6db242055ca..7c85edd867c 100644 --- a/objective-c/include/objc/IceGrid/IceGrid.h +++ b/objective-c/include/objc/IceGrid/IceGrid.h @@ -9,11 +9,8 @@ #import <objc/IceGrid/Admin.h> #import <objc/IceGrid/Exception.h> -#import <objc/IceGrid/Observer.h> #import <objc/IceGrid/Registry.h> #import <objc/IceGrid/UserAccountMapper.h> #import <objc/IceGrid/Descriptor.h> #import <objc/IceGrid/FileParser.h> -#import <objc/IceGrid/Locator.h> -#import <objc/IceGrid/Query.h> #import <objc/IceGrid/Session.h> diff --git a/objective-c/include/objc/IceGrid/Makefile b/objective-c/include/objc/IceGrid/Makefile deleted file mode 100644 index 9a79b139dbb..00000000000 --- a/objective-c/include/objc/IceGrid/Makefile +++ /dev/null @@ -1,26 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ../../.. - -include $(top_srcdir)/config/Make.rules - -install:: - @if test ! -d $(DESTDIR)$(install_includedir)/IceGrid ; \ - then \ - echo "Creating $(DESTDIR)$(install_includedir)/IceGrid..." ; \ - $(call mkdir,$(DESTDIR)$(install_includedir)/IceGrid) ; \ - fi - - @for i in *.h ; \ - do \ - echo "Installing $$i" ; \ - $(INSTALL_DATA) $$i $(DESTDIR)$(install_includedir)/IceGrid/$$i ; \ - chmod a+r $(DESTDIR)$(install_includedir)/IceGrid/$$i ; \ - done diff --git a/objective-c/include/objc/IceSSL.h b/objective-c/include/objc/IceSSL.h index 168b25d9c0e..88a877c1ee6 100644 --- a/objective-c/include/objc/IceSSL.h +++ b/objective-c/include/objc/IceSSL.h @@ -7,4 +7,4 @@ // // ********************************************************************** -#import "IceSSL/IceSSL.h" +#import <objc/IceSSL/IceSSL.h> diff --git a/objective-c/include/objc/IceSSL/.gitignore b/objective-c/include/objc/IceSSL/.gitignore deleted file mode 100644 index f53e54c68e3..00000000000 --- a/objective-c/include/objc/IceSSL/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -// Generated by makegitignore.py - -// IMPORTANT: Do not edit this file -- any edits made here will be lost! -EndpointInfo.h -ConnectionInfo.h diff --git a/objective-c/include/objc/IceSSL/Makefile b/objective-c/include/objc/IceSSL/Makefile deleted file mode 100644 index 3b390b0ff3f..00000000000 --- a/objective-c/include/objc/IceSSL/Makefile +++ /dev/null @@ -1,26 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ../../.. - -include $(top_srcdir)/config/Make.rules - -install:: - @if test ! -d $(DESTDIR)$(install_includedir)/IceSSL ; \ - then \ - echo "Creating $(DESTDIR)$(install_includedir)/IceSSL..." ; \ - $(call mkdir,$(DESTDIR)$(install_includedir)/IceSSL) ; \ - fi - - @for i in *.h ; \ - do \ - echo "Installing $$i" ; \ - $(INSTALL_DATA) $$i $(DESTDIR)$(install_includedir)/IceSSL/$$i ; \ - chmod a+r $(DESTDIR)$(install_includedir)/IceSSL/$$i ; \ - done diff --git a/objective-c/include/objc/IceStorm.h b/objective-c/include/objc/IceStorm.h index 7834200b400..92b7976867c 100644 --- a/objective-c/include/objc/IceStorm.h +++ b/objective-c/include/objc/IceStorm.h @@ -7,4 +7,4 @@ // // ********************************************************************** -#import "IceStorm/IceStorm.h" +#import <objc/IceStorm/IceStorm.h> diff --git a/objective-c/include/objc/IceStorm/.gitignore b/objective-c/include/objc/IceStorm/.gitignore deleted file mode 100644 index bb5bf8a8dc7..00000000000 --- a/objective-c/include/objc/IceStorm/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -// Generated by makegitignore.py - -// IMPORTANT: Do not edit this file -- any edits made here will be lost! -Metrics.h -IceStorm.h diff --git a/objective-c/include/objc/IceStorm/Makefile b/objective-c/include/objc/IceStorm/Makefile deleted file mode 100644 index b6144d64940..00000000000 --- a/objective-c/include/objc/IceStorm/Makefile +++ /dev/null @@ -1,26 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ../../.. - -include $(top_srcdir)/config/Make.rules - -install:: - @if test ! -d $(DESTDIR)$(install_includedir)/IceStorm ; \ - then \ - echo "Creating $(DESTDIR)$(install_includedir)/IceStorm..." ; \ - $(call mkdir,$(DESTDIR)$(install_includedir)/IceStorm) ; \ - fi - - @for i in *.h ; \ - do \ - echo "Installing $$i" ; \ - $(INSTALL_DATA) $$i $(DESTDIR)$(install_includedir)/IceStorm/$$i ; \ - chmod a+r $(DESTDIR)$(install_includedir)/IceStorm/$$i ; \ - done diff --git a/objective-c/include/objc/Makefile b/objective-c/include/objc/Makefile deleted file mode 100644 index d4445893a84..00000000000 --- a/objective-c/include/objc/Makefile +++ /dev/null @@ -1,29 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ../.. - -include $(top_srcdir)/config/Make.rules - -SUBDIRS = Ice IceSSL Glacier2 IceStorm IceGrid - -$(EVERYTHING):: - @for subdir in $(SUBDIRS); \ - do \ - echo "making $@ in $$subdir"; \ - ( cd $$subdir && $(MAKE) $@ ) || exit 1; \ - done - -install:: - @for i in *.h ; \ - do \ - echo "Installing $$i" ; \ - $(INSTALL_DATA) $$i $(DESTDIR)$(install_includedir)/$$i ; \ - chmod a+r $(DESTDIR)$(install_includedir)/$$i ; \ - done |