Tanner Bennett лет назад: 7
Родитель
Сommit
1eb8e4f430

+ 1 - 1
Classes/Editing/ArgumentInputViews/FLEXArgumentInputJSONObjectView.h

@@ -8,7 +8,7 @@
 
 #import "FLEXArgumentInputTextView.h"
 
-#warning TODO This is never supported
+// #warning TODO This is never supported
 @interface FLEXArgumentInputJSONObjectView : FLEXArgumentInputTextView
 
 @end

+ 1 - 1
Classes/GlobalStateExplorers/SystemLog/FLEXSystemLogMessage.m

@@ -94,7 +94,7 @@
 - (NSString *)description
 {
     NSString *escaped = [self.messageText stringByReplacingOccurrencesOfString:@"\n" withString:@"\\n"];
-    return [NSString stringWithFormat:@"(%lu) %@", self.messageText.length, escaped];
+    return [NSString stringWithFormat:@"(%@) %@", @(self.messageText.length), escaped];
 }
 
 @end

+ 10 - 0
Classes/Utility/FLEXObjcInternal.mm

@@ -51,6 +51,12 @@
 // objc-internal.h //
 /////////////////////
 
+#if __LP64__
+#define OBJC_HAVE_TAGGED_POINTERS 1
+#endif
+
+#if OBJC_HAVE_TAGGED_POINTERS
+
 #if TARGET_OS_OSX && __x86_64__
 // 64-bit Mac - tag bit is LSB
 #   define OBJC_MSB_TAGGED_POINTERS 0
@@ -101,6 +107,8 @@ static BOOL flex_isTaggedPointer(const void *ptr)
     return ((uintptr_t)ptr & _OBJC_TAG_MASK) == _OBJC_TAG_MASK;
 }
 
+#endif
+
 ///////////////////
 // objc-config.h //
 ///////////////////
@@ -305,11 +313,13 @@ BOOL FLEXPointerIsValidObjcObject(const void *ptr)
         return NO;
     }
 
+#if OBJC_HAVE_TAGGED_POINTERS
     // Tagged pointers have 0x1 set, no other valid pointers do
     // objc-internal.h -> _objc_isTaggedPointer()
     if (flex_isTaggedPointer(ptr) || flex_isExtTaggedPointer(ptr)) {
         return YES;
     }
+#endif
 
     // Check pointer alignment
     if ((pointer % sizeof(uintptr_t)) != 0) {