Permalink
Browse files

Update 3rd party libraries.

  • Loading branch information...
1 parent b1ff4bd commit 3a98c9686776a73bf8155a3940f2a346723173f7 @emsquared emsquared committed Feb 27, 2013
@@ -1028,8 +1028,8 @@ typedef enum GCDAsyncSocketError GCDAsyncSocketError;
* Note that this method may be called multiple times for a single read if you return positive numbers.
**/
- (NSTimeInterval)socket:(GCDAsyncSocket *)sock shouldTimeoutReadWithTag:(long)tag
- elapsed:(NSTimeInterval)elapsed
- bytesDone:(NSUInteger)length;
+ elapsed:(NSTimeInterval)elapsed
+ bytesDone:(NSUInteger)length;
/**
* Called if a write operation has reached its timeout without completing.
@@ -1043,8 +1043,8 @@ typedef enum GCDAsyncSocketError GCDAsyncSocketError;
* Note that this method may be called multiple times for a single write if you return positive numbers.
**/
- (NSTimeInterval)socket:(GCDAsyncSocket *)sock shouldTimeoutWriteWithTag:(long)tag
- elapsed:(NSTimeInterval)elapsed
- bytesDone:(NSUInteger)length;
+ elapsed:(NSTimeInterval)elapsed
+ bytesDone:(NSUInteger)length;
/**
* Conditionally called if the read stream closes, but the write stream may still be writeable.
View
@@ -1,6 +1,6 @@
// The MIT License
//
-// Copyright (c) 2012 Gwendal Roué
+// Copyright (c) 2013 Gwendal Roué
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
@@ -20,10 +20,10 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.
-#import "TextualApplication.h"
+#import <Foundation/Foundation.h>
+#import "GRMustacheAvailabilityMacros.h"
@protocol GRMustacheRendering;
-
@class GRMustacheTag;
@class GRMustacheContext;
@class GRMustacheTemplateRepository;
@@ -59,8 +59,9 @@ typedef struct {
*/
+ (GRMustacheVersion)version AVAILABLE_GRMUSTACHE_VERSION_6_0_AND_LATER;
+
////////////////////////////////////////////////////////////////////////////////
-/// @name Preventing NSUndefinedKeyException when using GRMustache in Development configuration
+/// @name Preventing NSUndefinedKeyException in Development configuration
////////////////////////////////////////////////////////////////////////////////
/**
@@ -81,17 +82,34 @@ typedef struct {
*
* One way to achieve this is to add `-DDEBUG` to the "Other C Flags" setting of
* your development configuration, and to wrap the
- * `prevenRZUndefinedKeyExceptionAttack` method call in a #if block, like:
+ * `preventNSUndefinedKeyExceptionAttack` method call in a #if block, like:
*
* #ifdef DEBUG
- * [GRMustache prevenRZUndefinedKeyExceptionAttack];
+ * [GRMustache preventNSUndefinedKeyExceptionAttack];
* #endif
*
* **Companion guide:** https://github.com/groue/GRMustache/blob/master/Guides/runtime.md
*
* @since v1.7
*/
-+ (void)prevenRZUndefinedKeyExceptionAttack AVAILABLE_GRMUSTACHE_VERSION_6_0_AND_LATER;
++ (void)preventNSUndefinedKeyExceptionAttack AVAILABLE_GRMUSTACHE_VERSION_6_0_AND_LATER;
+
+
+////////////////////////////////////////////////////////////////////////////////
+/// @name Standard Library
+////////////////////////////////////////////////////////////////////////////////
+
+/**
+ * @return The GRMustache standard library.
+ *
+ * @since v6.4
+ */
++ (NSObject *)standardLibrary AVAILABLE_GRMUSTACHE_VERSION_6_4_AND_LATER;
+
+
+////////////////////////////////////////////////////////////////////////////////
+/// @name Building rendering objects
+////////////////////////////////////////////////////////////////////////////////
/**
* Returns a rendering object that is able to render the argument _object_ for
@@ -116,11 +134,15 @@ typedef struct {
/**
* Returns a rendering object that renders with the provided block.
*
- * @param block A block that returns a tag rendering, provided with a rendering
- * context.
+ * @param block A block that follows the semantics of the
+ * renderForMustacheTag:context:HTMLSafe:error: method defined by
+ * the GRMustacheRendering protocol. See the documentation of this
+ * method.
*
* @return A rendering object
*
+ * @see GRMustacheRendering protocol
+ *
* @since v6.0
*/
+ (id<GRMustacheRendering>)renderingObjectWithBlock:(NSString *(^)(GRMustacheTag *tag, GRMustacheContext *context, BOOL *HTMLSafe, NSError **error))block AVAILABLE_GRMUSTACHE_VERSION_6_0_AND_LATER;
@@ -136,3 +158,5 @@ typedef struct {
#import "GRMustacheContext.h"
#import "GRMustacheRendering.h"
#import "GRMustacheTag.h"
+#import "GRMustacheConfiguration.h"
+#import "GRMustacheLocalizer.h"
@@ -1,6 +1,6 @@
// The MIT License
//
-// Copyright (c) 2012 Gwendal Roué
+// Copyright (c) 2013 Gwendal Roué
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
@@ -20,7 +20,7 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.
-#import "TextualApplication.h"
+
@@ -30,17 +30,20 @@
*/
#define GRMUSTACHE_VERSION_6_0 6000
#define GRMUSTACHE_VERSION_6_1 6010
+#define GRMUSTACHE_VERSION_6_2 6020
+#define GRMUSTACHE_VERSION_6_3 6030
+#define GRMUSTACHE_VERSION_6_4 6040
/*
- * If max GRMustacheVersion not specified, assume 6.1
+ * If max GRMustacheVersion not specified, assume 6.4
*/
#ifndef GRMUSTACHE_VERSION_MAX_ALLOWED
-#define GRMUSTACHE_VERSION_MAX_ALLOWED GRMUSTACHE_VERSION_6_1
+#define GRMUSTACHE_VERSION_MAX_ALLOWED GRMUSTACHE_VERSION_6_4
#endif
/*
@@ -145,3 +148,234 @@
+/*
+ * AVAILABLE_GRMUSTACHE_VERSION_6_2_AND_LATER
+ *
+ * Used on declarations introduced in GRMustache 6.2
+ */
+#if GRMUSTACHE_VERSION_MAX_ALLOWED < GRMUSTACHE_VERSION_6_2
+#define AVAILABLE_GRMUSTACHE_VERSION_6_2_AND_LATER UNAVAILABLE_ATTRIBUTE
+#elif GRMUSTACHE_VERSION_MIN_REQUIRED < GRMUSTACHE_VERSION_6_2
+#define AVAILABLE_GRMUSTACHE_VERSION_6_2_AND_LATER WEAK_IMPORT_ATTRIBUTE
+#else
+#define AVAILABLE_GRMUSTACHE_VERSION_6_2_AND_LATER
+#endif
+
+/*
+ * AVAILABLE_GRMUSTACHE_VERSION_6_2_AND_LATER_BUT_DEPRECATED
+ *
+ * Used on declarations introduced in GRMustache 6.2,
+ * and deprecated in GRMustache 6.2
+ */
+#if GRMUSTACHE_VERSION_MIN_REQUIRED >= GRMUSTACHE_VERSION_6_2
+#define AVAILABLE_GRMUSTACHE_VERSION_6_2_AND_LATER_BUT_DEPRECATED DEPRECATED_ATTRIBUTE
+#else
+#define AVAILABLE_GRMUSTACHE_VERSION_6_2_AND_LATER_BUT_DEPRECATED AVAILABLE_GRMUSTACHE_VERSION_6_2_AND_LATER
+#endif
+
+/*
+ * AVAILABLE_GRMUSTACHE_VERSION_6_0_AND_LATER_BUT_DEPRECATED_IN_GRMUSTACHE_VERSION_6_2
+ *
+ * Used on declarations introduced in GRMustache 6.0,
+ * but later deprecated in GRMustache 6.2
+ */
+#if GRMUSTACHE_VERSION_MIN_REQUIRED >= GRMUSTACHE_VERSION_6_2
+#define AVAILABLE_GRMUSTACHE_VERSION_6_0_AND_LATER_BUT_DEPRECATED_IN_GRMUSTACHE_VERSION_6_2 DEPRECATED_ATTRIBUTE
+#else
+#define AVAILABLE_GRMUSTACHE_VERSION_6_0_AND_LATER_BUT_DEPRECATED_IN_GRMUSTACHE_VERSION_6_2 AVAILABLE_GRMUSTACHE_VERSION_6_0_AND_LATER
+#endif
+
+/*
+ * AVAILABLE_GRMUSTACHE_VERSION_6_1_AND_LATER_BUT_DEPRECATED_IN_GRMUSTACHE_VERSION_6_2
+ *
+ * Used on declarations introduced in GRMustache 6.1,
+ * but later deprecated in GRMustache 6.2
+ */
+#if GRMUSTACHE_VERSION_MIN_REQUIRED >= GRMUSTACHE_VERSION_6_2
+#define AVAILABLE_GRMUSTACHE_VERSION_6_1_AND_LATER_BUT_DEPRECATED_IN_GRMUSTACHE_VERSION_6_2 DEPRECATED_ATTRIBUTE
+#else
+#define AVAILABLE_GRMUSTACHE_VERSION_6_1_AND_LATER_BUT_DEPRECATED_IN_GRMUSTACHE_VERSION_6_2 AVAILABLE_GRMUSTACHE_VERSION_6_1_AND_LATER
+#endif
+
+/*
+ * DEPRECATED_IN_GRMUSTACHE_VERSION_6_2_AND_LATER
+ *
+ * Used on types deprecated in GRMustache 6.2
+ */
+#if GRMUSTACHE_VERSION_MIN_REQUIRED >= GRMUSTACHE_VERSION_6_2
+#define DEPRECATED_IN_GRMUSTACHE_VERSION_6_2_AND_LATER DEPRECATED_ATTRIBUTE
+#else
+#define DEPRECATED_IN_GRMUSTACHE_VERSION_6_2_AND_LATER
+#endif
+
+
+
+
+
+
+/*
+ * AVAILABLE_GRMUSTACHE_VERSION_6_3_AND_LATER
+ *
+ * Used on declarations introduced in GRMustache 6.3
+ */
+#if GRMUSTACHE_VERSION_MAX_ALLOWED < GRMUSTACHE_VERSION_6_3
+#define AVAILABLE_GRMUSTACHE_VERSION_6_3_AND_LATER UNAVAILABLE_ATTRIBUTE
+#elif GRMUSTACHE_VERSION_MIN_REQUIRED < GRMUSTACHE_VERSION_6_3
+#define AVAILABLE_GRMUSTACHE_VERSION_6_3_AND_LATER WEAK_IMPORT_ATTRIBUTE
+#else
+#define AVAILABLE_GRMUSTACHE_VERSION_6_3_AND_LATER
+#endif
+
+/*
+ * AVAILABLE_GRMUSTACHE_VERSION_6_3_AND_LATER_BUT_DEPRECATED
+ *
+ * Used on declarations introduced in GRMustache 6.3,
+ * and deprecated in GRMustache 6.3
+ */
+#if GRMUSTACHE_VERSION_MIN_REQUIRED >= GRMUSTACHE_VERSION_6_3
+#define AVAILABLE_GRMUSTACHE_VERSION_6_3_AND_LATER_BUT_DEPRECATED DEPRECATED_ATTRIBUTE
+#else
+#define AVAILABLE_GRMUSTACHE_VERSION_6_3_AND_LATER_BUT_DEPRECATED AVAILABLE_GRMUSTACHE_VERSION_6_3_AND_LATER
+#endif
+
+/*
+ * AVAILABLE_GRMUSTACHE_VERSION_6_0_AND_LATER_BUT_DEPRECATED_IN_GRMUSTACHE_VERSION_6_3
+ *
+ * Used on declarations introduced in GRMustache 6.0,
+ * but later deprecated in GRMustache 6.3
+ */
+#if GRMUSTACHE_VERSION_MIN_REQUIRED >= GRMUSTACHE_VERSION_6_3
+#define AVAILABLE_GRMUSTACHE_VERSION_6_0_AND_LATER_BUT_DEPRECATED_IN_GRMUSTACHE_VERSION_6_3 DEPRECATED_ATTRIBUTE
+#else
+#define AVAILABLE_GRMUSTACHE_VERSION_6_0_AND_LATER_BUT_DEPRECATED_IN_GRMUSTACHE_VERSION_6_3 AVAILABLE_GRMUSTACHE_VERSION_6_0_AND_LATER
+#endif
+
+/*
+ * AVAILABLE_GRMUSTACHE_VERSION_6_1_AND_LATER_BUT_DEPRECATED_IN_GRMUSTACHE_VERSION_6_3
+ *
+ * Used on declarations introduced in GRMustache 6.1,
+ * but later deprecated in GRMustache 6.3
+ */
+#if GRMUSTACHE_VERSION_MIN_REQUIRED >= GRMUSTACHE_VERSION_6_3
+#define AVAILABLE_GRMUSTACHE_VERSION_6_1_AND_LATER_BUT_DEPRECATED_IN_GRMUSTACHE_VERSION_6_3 DEPRECATED_ATTRIBUTE
+#else
+#define AVAILABLE_GRMUSTACHE_VERSION_6_1_AND_LATER_BUT_DEPRECATED_IN_GRMUSTACHE_VERSION_6_3 AVAILABLE_GRMUSTACHE_VERSION_6_1_AND_LATER
+#endif
+
+/*
+ * AVAILABLE_GRMUSTACHE_VERSION_6_2_AND_LATER_BUT_DEPRECATED_IN_GRMUSTACHE_VERSION_6_3
+ *
+ * Used on declarations introduced in GRMustache 6.2,
+ * but later deprecated in GRMustache 6.3
+ */
+#if GRMUSTACHE_VERSION_MIN_REQUIRED >= GRMUSTACHE_VERSION_6_3
+#define AVAILABLE_GRMUSTACHE_VERSION_6_2_AND_LATER_BUT_DEPRECATED_IN_GRMUSTACHE_VERSION_6_3 DEPRECATED_ATTRIBUTE
+#else
+#define AVAILABLE_GRMUSTACHE_VERSION_6_2_AND_LATER_BUT_DEPRECATED_IN_GRMUSTACHE_VERSION_6_3 AVAILABLE_GRMUSTACHE_VERSION_6_2_AND_LATER
+#endif
+
+/*
+ * DEPRECATED_IN_GRMUSTACHE_VERSION_6_3_AND_LATER
+ *
+ * Used on types deprecated in GRMustache 6.3
+ */
+#if GRMUSTACHE_VERSION_MIN_REQUIRED >= GRMUSTACHE_VERSION_6_3
+#define DEPRECATED_IN_GRMUSTACHE_VERSION_6_3_AND_LATER DEPRECATED_ATTRIBUTE
+#else
+#define DEPRECATED_IN_GRMUSTACHE_VERSION_6_3_AND_LATER
+#endif
+
+
+
+
+
+
+/*
+ * AVAILABLE_GRMUSTACHE_VERSION_6_4_AND_LATER
+ *
+ * Used on declarations introduced in GRMustache 6.4
+ */
+#if GRMUSTACHE_VERSION_MAX_ALLOWED < GRMUSTACHE_VERSION_6_4
+#define AVAILABLE_GRMUSTACHE_VERSION_6_4_AND_LATER UNAVAILABLE_ATTRIBUTE
+#elif GRMUSTACHE_VERSION_MIN_REQUIRED < GRMUSTACHE_VERSION_6_4
+#define AVAILABLE_GRMUSTACHE_VERSION_6_4_AND_LATER WEAK_IMPORT_ATTRIBUTE
+#else
+#define AVAILABLE_GRMUSTACHE_VERSION_6_4_AND_LATER
+#endif
+
+/*
+ * AVAILABLE_GRMUSTACHE_VERSION_6_4_AND_LATER_BUT_DEPRECATED
+ *
+ * Used on declarations introduced in GRMustache 6.4,
+ * and deprecated in GRMustache 6.4
+ */
+#if GRMUSTACHE_VERSION_MIN_REQUIRED >= GRMUSTACHE_VERSION_6_4
+#define AVAILABLE_GRMUSTACHE_VERSION_6_4_AND_LATER_BUT_DEPRECATED DEPRECATED_ATTRIBUTE
+#else
+#define AVAILABLE_GRMUSTACHE_VERSION_6_4_AND_LATER_BUT_DEPRECATED AVAILABLE_GRMUSTACHE_VERSION_6_4_AND_LATER
+#endif
+
+/*
+ * AVAILABLE_GRMUSTACHE_VERSION_6_0_AND_LATER_BUT_DEPRECATED_IN_GRMUSTACHE_VERSION_6_4
+ *
+ * Used on declarations introduced in GRMustache 6.0,
+ * but later deprecated in GRMustache 6.4
+ */
+#if GRMUSTACHE_VERSION_MIN_REQUIRED >= GRMUSTACHE_VERSION_6_4
+#define AVAILABLE_GRMUSTACHE_VERSION_6_0_AND_LATER_BUT_DEPRECATED_IN_GRMUSTACHE_VERSION_6_4 DEPRECATED_ATTRIBUTE
+#else
+#define AVAILABLE_GRMUSTACHE_VERSION_6_0_AND_LATER_BUT_DEPRECATED_IN_GRMUSTACHE_VERSION_6_4 AVAILABLE_GRMUSTACHE_VERSION_6_0_AND_LATER
+#endif
+
+/*
+ * AVAILABLE_GRMUSTACHE_VERSION_6_1_AND_LATER_BUT_DEPRECATED_IN_GRMUSTACHE_VERSION_6_4
+ *
+ * Used on declarations introduced in GRMustache 6.1,
+ * but later deprecated in GRMustache 6.4
+ */
+#if GRMUSTACHE_VERSION_MIN_REQUIRED >= GRMUSTACHE_VERSION_6_4
+#define AVAILABLE_GRMUSTACHE_VERSION_6_1_AND_LATER_BUT_DEPRECATED_IN_GRMUSTACHE_VERSION_6_4 DEPRECATED_ATTRIBUTE
+#else
+#define AVAILABLE_GRMUSTACHE_VERSION_6_1_AND_LATER_BUT_DEPRECATED_IN_GRMUSTACHE_VERSION_6_4 AVAILABLE_GRMUSTACHE_VERSION_6_1_AND_LATER
+#endif
+
+/*
+ * AVAILABLE_GRMUSTACHE_VERSION_6_2_AND_LATER_BUT_DEPRECATED_IN_GRMUSTACHE_VERSION_6_4
+ *
+ * Used on declarations introduced in GRMustache 6.2,
+ * but later deprecated in GRMustache 6.4
+ */
+#if GRMUSTACHE_VERSION_MIN_REQUIRED >= GRMUSTACHE_VERSION_6_4
+#define AVAILABLE_GRMUSTACHE_VERSION_6_2_AND_LATER_BUT_DEPRECATED_IN_GRMUSTACHE_VERSION_6_4 DEPRECATED_ATTRIBUTE
+#else
+#define AVAILABLE_GRMUSTACHE_VERSION_6_2_AND_LATER_BUT_DEPRECATED_IN_GRMUSTACHE_VERSION_6_4 AVAILABLE_GRMUSTACHE_VERSION_6_2_AND_LATER
+#endif
+
+/*
+ * AVAILABLE_GRMUSTACHE_VERSION_6_3_AND_LATER_BUT_DEPRECATED_IN_GRMUSTACHE_VERSION_6_4
+ *
+ * Used on declarations introduced in GRMustache 6.3,
+ * but later deprecated in GRMustache 6.4
+ */
+#if GRMUSTACHE_VERSION_MIN_REQUIRED >= GRMUSTACHE_VERSION_6_4
+#define AVAILABLE_GRMUSTACHE_VERSION_6_3_AND_LATER_BUT_DEPRECATED_IN_GRMUSTACHE_VERSION_6_4 DEPRECATED_ATTRIBUTE
+#else
+#define AVAILABLE_GRMUSTACHE_VERSION_6_3_AND_LATER_BUT_DEPRECATED_IN_GRMUSTACHE_VERSION_6_4 AVAILABLE_GRMUSTACHE_VERSION_6_3_AND_LATER
+#endif
+
+/*
+ * DEPRECATED_IN_GRMUSTACHE_VERSION_6_4_AND_LATER
+ *
+ * Used on types deprecated in GRMustache 6.4
+ */
+#if GRMUSTACHE_VERSION_MIN_REQUIRED >= GRMUSTACHE_VERSION_6_4
+#define DEPRECATED_IN_GRMUSTACHE_VERSION_6_4_AND_LATER DEPRECATED_ATTRIBUTE
+#else
+#define DEPRECATED_IN_GRMUSTACHE_VERSION_6_4_AND_LATER
+#endif
+
+
+
+
+
+
Oops, something went wrong.

0 comments on commit 3a98c96

Please sign in to comment.