diff --git a/AG/AttributeGraph.xcframework/ios-arm64-arm64e/AttributeGraph.framework/Headers/AGCompareValues.h b/AG/AttributeGraph.xcframework/ios-arm64-arm64e/AttributeGraph.framework/Headers/AGCompareValues.h index 5af7979..2fc6604 100644 --- a/AG/AttributeGraph.xcframework/ios-arm64-arm64e/AttributeGraph.framework/Headers/AGCompareValues.h +++ b/AG/AttributeGraph.xcframework/ios-arm64-arm64e/AttributeGraph.framework/Headers/AGCompareValues.h @@ -10,12 +10,11 @@ #include "AGBase.h" #include "AGComparisonMode.h" -#include 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/AttributeGraph.xcframework/ios-arm64-x86_64-simulator/AttributeGraph.framework/Headers/AGCompareValues.h b/AG/AttributeGraph.xcframework/ios-arm64-x86_64-simulator/AttributeGraph.framework/Headers/AGCompareValues.h index 5af7979..2fc6604 100644 --- a/AG/AttributeGraph.xcframework/ios-arm64-x86_64-simulator/AttributeGraph.framework/Headers/AGCompareValues.h +++ b/AG/AttributeGraph.xcframework/ios-arm64-x86_64-simulator/AttributeGraph.framework/Headers/AGCompareValues.h @@ -10,12 +10,11 @@ #include "AGBase.h" #include "AGComparisonMode.h" -#include 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/AttributeGraph.xcframework/macos-arm64e-arm64-x86_64/AttributeGraph.framework/Headers/AGCompareValues.h b/AG/AttributeGraph.xcframework/macos-arm64e-arm64-x86_64/AttributeGraph.framework/Headers/AGCompareValues.h index 5af7979..2fc6604 100644 --- a/AG/AttributeGraph.xcframework/macos-arm64e-arm64-x86_64/AttributeGraph.framework/Headers/AGCompareValues.h +++ b/AG/AttributeGraph.xcframework/macos-arm64e-arm64-x86_64/AttributeGraph.framework/Headers/AGCompareValues.h @@ -10,12 +10,11 @@ #include "AGBase.h" #include "AGComparisonMode.h" -#include 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 index 5af7979..2fc6604 100644 --- a/AG/Sources/Headers/AGCompareValues.h +++ b/AG/Sources/Headers/AGCompareValues.h @@ -10,12 +10,11 @@ #include "AGBase.h" #include "AGComparisonMode.h" -#include 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 index 5fcad00..e2e89ce 100644 --- a/Sources/OpenGraph/Runtime/CompareValues.swift +++ b/Sources/OpenGraph/Runtime/CompareValues.swift @@ -8,25 +8,21 @@ 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(_ 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) - } - } + compareValues(lhs, rhs, options: OGComparisonOptions(mode: mode)) } public func compareValues(_ 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) } } }