Merge pull request #872 from SRGSSR/libextobjc-conflict-fix

Fix for compilation issue when Mantle 2.1.5 is integrated alongside libextobjc with CocoaPods

Mantle/MTLJSONAdapter.m

@@ -10,8 +10,8 @@
 
 #import "NSDictionary+MTLJSONKeyPath.h"
 
-#import "EXTRuntimeExtensions.h"
-#import "EXTScope.h"
+#import "MTLEXTRuntimeExtensions.h"
+#import "MTLEXTScope.h"
 #import "MTLJSONAdapter.h"
 #import "MTLModel.h"
 #import "MTLTransformerErrorHandling.h"

Mantle/MTLModel+NSCoding.m

@@ -6,8 +6,8 @@
 //  Copyright (c) 2013 GitHub. All rights reserved.
 //
 
-#import "EXTRuntimeExtensions.h"
-#import "EXTScope.h"
+#import "MTLEXTRuntimeExtensions.h"
+#import "MTLEXTScope.h"
 #import "MTLModel+NSCoding.h"
 #import "MTLReflection.h"
 

Mantle/MTLModel.m

@@ -6,11 +6,11 @@
 //  Copyright (c) 2012 GitHub. All rights reserved.
 //
 
-#import "EXTRuntimeExtensions.h"
-#import "EXTScope.h"
-#import "NSError+MTLModelException.h"
+#import "MTLEXTRuntimeExtensions.h"
+#import "MTLEXTScope.h"
 #import "MTLModel.h"
 #import "MTLReflection.h"
+#import "NSError+MTLModelException.h"
 #import <objc/runtime.h>
 
 // Used to cache the reflection performed in +propertyKeys.

Mantle/extobjc/EXTRuntimeExtensions.m → Mantle/extobjc/MTLEXTRuntimeExtensions.m

@@ -1,13 +1,13 @@
 //
-//  EXTRuntimeExtensions.m
+//  MTLEXTRuntimeExtensions.m
 //  extobjc
 //
 //  Created by Justin Spahr-Summers on 2011-03-05.
 //  Copyright (C) 2012 Justin Spahr-Summers.
 //  Released under the MIT license.
 //
 
-#import "EXTRuntimeExtensions.h"
+#import "MTLEXTRuntimeExtensions.h"
 #import <ctype.h>
 #import <libkern/OSAtomic.h>
 #import <objc/message.h>
@@ -41,10 +41,10 @@
     //
     // this does NOT refer to a special protocol having been injected already
     BOOL ready;
-} EXTSpecialProtocol;
+} MTLSpecialProtocol;
 
-// the full list of special protocols (an array of EXTSpecialProtocol structs)
-static EXTSpecialProtocol * restrict specialProtocols = NULL;
+// the full list of special protocols (an array of MTLSpecialProtocol structs)
+static MTLSpecialProtocol * restrict specialProtocols = NULL;
 
 // the number of special protocols stored in the array
 static size_t specialProtocolCount = 0;
@@ -54,7 +54,7 @@
 // generally going to be a power-of-two
 static size_t specialProtocolCapacity = 0;
 
-// the number of EXTSpecialProtocols which have been marked as ready for
+// the number of MTLSpecialProtocols which have been marked as ready for
 // injection (though not necessary injected)
 //
 // in other words, the total count which have 'ready' set to YES
@@ -81,16 +81,16 @@ static void mtl_injectSpecialProtocols (void) {
      * a special protocol conforms to another special protocol, the former
      * will be prioritized above the latter.
      */
-    qsort_b(specialProtocols, specialProtocolCount, sizeof(EXTSpecialProtocol), ^(const void *a, const void *b){
+    qsort_b(specialProtocols, specialProtocolCount, sizeof(MTLSpecialProtocol), ^(const void *a, const void *b){
         // if the pointers are equal, it must be the same protocol
         if (a == b)
             return 0;
 
-        const EXTSpecialProtocol *protoA = a;
-        const EXTSpecialProtocol *protoB = b;
+        const MTLSpecialProtocol *protoA = a;
+        const MTLSpecialProtocol *protoB = b;
 
         // A higher return value here means a higher priority
-        int (^protocolInjectionPriority)(const EXTSpecialProtocol *) = ^(const EXTSpecialProtocol *specialProtocol){
+        int (^protocolInjectionPriority)(const MTLSpecialProtocol *) = ^(const MTLSpecialProtocol *specialProtocol){
             int runningTotal = 0;
 
             for (size_t i = 0;i < specialProtocolCount;++i) {
@@ -799,9 +799,9 @@ BOOL mtl_loadSpecialProtocol (Protocol *protocol, void (^injectionBehavior)(Clas
         #ifndef __clang_analyzer__
         mtl_specialProtocolInjectionBlock copiedBlock = [injectionBehavior copy];
 
-        // construct a new EXTSpecialProtocol structure and add it to the first
+        // construct a new MTLSpecialProtocol structure and add it to the first
         // empty space in the array
-        specialProtocols[specialProtocolCount] = (EXTSpecialProtocol){
+        specialProtocols[specialProtocolCount] = (MTLSpecialProtocol){
             .protocol = protocol,
             .injectionBlock = (__bridge_retained void *)copiedBlock,
             .ready = NO

Mantle/extobjc/EXTScope.m → Mantle/extobjc/MTLEXTScope.m

@@ -1,13 +1,13 @@
 //
-//  EXTScope.m
+//  MTLEXTScope.m
 //  extobjc
 //
 //  Created by Justin Spahr-Summers on 2011-05-04.
 //  Copyright (C) 2012 Justin Spahr-Summers.
 //  Released under the MIT license.
 //
 
-#import "EXTScope.h"
+#import "MTLEXTScope.h"
 
 void mtl_executeCleanupBlock (__strong mtl_cleanupBlock_t *block) {
     (*block)();

Mantle/extobjc/include/EXTKeyPathCoding.h → Mantle/extobjc/include/MTLEXTKeyPathCoding.h

@@ -1,5 +1,5 @@
 //
-//  EXTKeyPathCoding.h
+//  MTLEXTKeyPathCoding.h
 //  extobjc
 //
 //  Created by Justin Spahr-Summers on 19.06.12.
@@ -8,7 +8,7 @@
 //
 
 #import <Foundation/Foundation.h>
-#import "metamacros.h"
+#import "MTLMetamacros.h"
 
 /**
  * \@keypath allows compile-time verification of key paths. Given a real object

Mantle/extobjc/include/EXTRuntimeExtensions.h → Mantle/extobjc/include/MTLEXTRuntimeExtensions.h

@@ -1,5 +1,5 @@
 //
-//  EXTRuntimeExtensions.h
+//  MTLEXTRuntimeExtensions.h
 //  extobjc
 //
 //  Created by Justin Spahr-Summers on 2011-03-05.

Mantle/extobjc/include/EXTScope.h → Mantle/extobjc/include/MTLEXTScope.h

@@ -1,13 +1,13 @@
 //
-//  EXTScope.h
+//  MTLEXTScope.h
 //  extobjc
 //
 //  Created by Justin Spahr-Summers on 2011-05-04.
 //  Copyright (C) 2012 Justin Spahr-Summers.
 //  Released under the MIT license.
 //
 
-#import "metamacros.h"
+#import "MTLMetamacros.h"
 
 /**
  * \@onExit defines some code to be executed when the current scope exits. The