Fix compareValues implementation

OpenSwiftUIProject · Apr 21, 2024 · ef5e8c1 · ef5e8c1
1 parent 315468c
commit ef5e8c1
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 16 deletions.
diff --git a/...buteGraph.xcframework/ios-arm64-arm64e/AttributeGraph.framework/Headers/AGCompareValues.h b/...buteGraph.xcframework/ios-arm64-arm64e/AttributeGraph.framework/Headers/AGCompareValues.h
@@ -10,12 +10,11 @@
 
 #include "AGBase.h"
 #include "AGComparisonMode.h"
-#include <stdbool.h>
 
 AG_EXTERN_C_BEGIN
 AG_EXPORT
 AG_REFINED_FOR_SWIFT
-bool AGCompareValues(const void *lhs, const void *rhs, const AGComparisonMode comparisonMode, const void *type);
+bool AGCompareValues(const void *lhs, const void *rhs, const void *type, const AGComparisonMode comparisonMode);
 AG_EXTERN_C_END
 
 #endif /* AGCompareValues_h */
diff --git a/...xcframework/ios-arm64-x86_64-simulator/AttributeGraph.framework/Headers/AGCompareValues.h b/...xcframework/ios-arm64-x86_64-simulator/AttributeGraph.framework/Headers/AGCompareValues.h
@@ -10,12 +10,11 @@
 
 #include "AGBase.h"
 #include "AGComparisonMode.h"
-#include <stdbool.h>
 
 AG_EXTERN_C_BEGIN
 AG_EXPORT
 AG_REFINED_FOR_SWIFT
-bool AGCompareValues(const void *lhs, const void *rhs, const AGComparisonMode comparisonMode, const void *type);
+bool AGCompareValues(const void *lhs, const void *rhs, const void *type, const AGComparisonMode comparisonMode);
 AG_EXTERN_C_END
 
 #endif /* AGCompareValues_h */
diff --git a/....xcframework/macos-arm64e-arm64-x86_64/AttributeGraph.framework/Headers/AGCompareValues.h b/....xcframework/macos-arm64e-arm64-x86_64/AttributeGraph.framework/Headers/AGCompareValues.h
@@ -10,12 +10,11 @@
 
 #include "AGBase.h"
 #include "AGComparisonMode.h"
-#include <stdbool.h>
 
 AG_EXTERN_C_BEGIN
 AG_EXPORT
 AG_REFINED_FOR_SWIFT
-bool AGCompareValues(const void *lhs, const void *rhs, const AGComparisonMode comparisonMode, const void *type);
+bool AGCompareValues(const void *lhs, const void *rhs, const void *type, const AGComparisonMode comparisonMode);
 AG_EXTERN_C_END
 
 #endif /* AGCompareValues_h */
diff --git a/AG/Sources/Headers/AGCompareValues.h b/AG/Sources/Headers/AGCompareValues.h
@@ -10,12 +10,11 @@
 
 #include "AGBase.h"
 #include "AGComparisonMode.h"
-#include <stdbool.h>
 
 AG_EXTERN_C_BEGIN
 AG_EXPORT
 AG_REFINED_FOR_SWIFT
-bool AGCompareValues(const void *lhs, const void *rhs, const AGComparisonMode comparisonMode, const void *type);
+bool AGCompareValues(const void *lhs, const void *rhs, const void *type, const AGComparisonMode comparisonMode);
 AG_EXTERN_C_END
 
 #endif /* AGCompareValues_h */
diff --git a/Sources/OpenGraph/Runtime/CompareValues.swift b/Sources/OpenGraph/Runtime/CompareValues.swift
@@ -8,25 +8,25 @@
 import _OpenGraph
 
 @_silgen_name("OGCompareValues")
-@inlinable
-@inline(__always)
-func OGCompareValues(lhs: UnsafeRawPointer,
-                            rhs: UnsafeRawPointer,
-                            options: OGComparisonOptions,
-                            type: Any.Type) -> Bool
+private func OGCompareValues(
+    lhs: UnsafeRawPointer,
+    rhs: UnsafeRawPointer,
+    type: Any.Type,
+    options: OGComparisonOptions
+) -> Bool
 
 public func compareValues<Value>(_ lhs: Value, _ rhs: Value, mode: OGComparisonMode = ._3) -> Bool {
     withUnsafePointer(to: lhs) { p1 in
         withUnsafePointer(to: rhs) { p2 in
-            OGCompareValues(lhs: p1, rhs: p2, options: .init(mode: mode), type: Value.self)
+            OGCompareValues(lhs: p1, rhs: p2, type: Value.self, options: .init(mode: mode))
         }
     }
 }
 
 public func compareValues<Value>(_ lhs: Value, _ rhs: Value, options: OGComparisonOptions) -> Bool {
     withUnsafePointer(to: lhs) { p1 in
         withUnsafePointer(to: rhs) { p2 in
-            OGCompareValues(lhs: p1, rhs: p2, options: options, type: Value.self)
+            OGCompareValues(lhs: p1, rhs: p2, type: Value.self, options: options)
         }
     }
 }