Przeglądaj źródła

Fix priority constants preventing compilation under Xcode 6/LLVM 3.5

Zachary Waldowski 11 lat temu
rodzic
commit
4bf0d0fca7
1 zmienionych plików z 15 dodań i 19 usunięć
  1. 15 19
      Masonry/MASUtilities.h

+ 15 - 19
Masonry/MASUtilities.h

@@ -14,14 +14,12 @@
     #define MAS_VIEW UIView
     #define MASEdgeInsets UIEdgeInsets
 
-    enum {
-        MASLayoutPriorityRequired = UILayoutPriorityRequired,
-        MASLayoutPriorityDefaultHigh = UILayoutPriorityDefaultHigh,
-        MASLayoutPriorityDefaultMedium = 500,
-        MASLayoutPriorityDefaultLow = UILayoutPriorityDefaultLow,
-        MASLayoutPriorityFittingSizeLevel = UILayoutPriorityFittingSizeLevel,
-    };
-    typedef float MASLayoutPriority;
+    typedef UILayoutPriority MASLayoutPriority;
+    static const MASLayoutPriority MASLayoutPriorityRequired = UILayoutPriorityRequired;
+    static const MASLayoutPriority MASLayoutPriorityDefaultHigh = UILayoutPriorityDefaultHigh;
+    static const MASLayoutPriority MASLayoutPriorityDefaultMedium = 500;
+    static const MASLayoutPriority MASLayoutPriorityDefaultLow = UILayoutPriorityDefaultLow;
+    static const MASLayoutPriority MASLayoutPriorityFittingSizeLevel = UILayoutPriorityFittingSizeLevel;
 
 #elif TARGET_OS_MAC
 
@@ -29,17 +27,15 @@
     #define MAS_VIEW NSView
     #define MASEdgeInsets NSEdgeInsets
 
-    enum {
-        MASLayoutPriorityRequired = NSLayoutPriorityRequired,
-        MASLayoutPriorityDefaultHigh = NSLayoutPriorityDefaultHigh,
-        MASLayoutPriorityDragThatCanResizeWindow = NSLayoutPriorityDragThatCanResizeWindow,
-        MASLayoutPriorityDefaultMedium = 501,
-        MASLayoutPriorityWindowSizeStayPut = NSLayoutPriorityWindowSizeStayPut,
-        MASLayoutPriorityDragThatCannotResizeWindow = NSLayoutPriorityDragThatCannotResizeWindow,
-        MASLayoutPriorityDefaultLow = NSLayoutPriorityDefaultLow,
-        MASLayoutPriorityFittingSizeCompression = NSLayoutPriorityFittingSizeCompression,
-    };
-    typedef float MASLayoutPriority;
+    typedef NSLayoutPriority MASLayoutPriority;
+    static const MASLayoutPriority MASLayoutPriorityRequired = NSLayoutPriorityRequired;
+    static const MASLayoutPriority MASLayoutPriorityDefaultHigh = NSLayoutPriorityDefaultHigh;
+    static const MASLayoutPriority MASLayoutPriorityDragThatCanResizeWindow = NSLayoutPriorityDragThatCanResizeWindow;
+    static const MASLayoutPriority MASLayoutPriorityDefaultMedium = 501;
+    static const MASLayoutPriority MASLayoutPriorityWindowSizeStayPut = NSLayoutPriorityWindowSizeStayPut;
+    static const MASLayoutPriority MASLayoutPriorityDragThatCannotResizeWindow = NSLayoutPriorityDragThatCannotResizeWindow;
+    static const MASLayoutPriority MASLayoutPriorityDefaultLow = NSLayoutPriorityDefaultLow;
+    static const MASLayoutPriority MASLayoutPriorityFittingSizeCompression = NSLayoutPriorityFittingSizeCompression;
 
 #endif