Skip to content

Commit ef5e8c1

Browse files
committed
Fix compareValues implementation
1 parent 315468c commit ef5e8c1

File tree

5 files changed

+12
-16
lines changed

5 files changed

+12
-16
lines changed

AG/AttributeGraph.xcframework/ios-arm64-arm64e/AttributeGraph.framework/Headers/AGCompareValues.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,11 @@
1010

1111
#include "AGBase.h"
1212
#include "AGComparisonMode.h"
13-
#include <stdbool.h>
1413

1514
AG_EXTERN_C_BEGIN
1615
AG_EXPORT
1716
AG_REFINED_FOR_SWIFT
18-
bool AGCompareValues(const void *lhs, const void *rhs, const AGComparisonMode comparisonMode, const void *type);
17+
bool AGCompareValues(const void *lhs, const void *rhs, const void *type, const AGComparisonMode comparisonMode);
1918
AG_EXTERN_C_END
2019

2120
#endif /* AGCompareValues_h */

AG/AttributeGraph.xcframework/ios-arm64-x86_64-simulator/AttributeGraph.framework/Headers/AGCompareValues.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,11 @@
1010

1111
#include "AGBase.h"
1212
#include "AGComparisonMode.h"
13-
#include <stdbool.h>
1413

1514
AG_EXTERN_C_BEGIN
1615
AG_EXPORT
1716
AG_REFINED_FOR_SWIFT
18-
bool AGCompareValues(const void *lhs, const void *rhs, const AGComparisonMode comparisonMode, const void *type);
17+
bool AGCompareValues(const void *lhs, const void *rhs, const void *type, const AGComparisonMode comparisonMode);
1918
AG_EXTERN_C_END
2019

2120
#endif /* AGCompareValues_h */

AG/AttributeGraph.xcframework/macos-arm64e-arm64-x86_64/AttributeGraph.framework/Headers/AGCompareValues.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,11 @@
1010

1111
#include "AGBase.h"
1212
#include "AGComparisonMode.h"
13-
#include <stdbool.h>
1413

1514
AG_EXTERN_C_BEGIN
1615
AG_EXPORT
1716
AG_REFINED_FOR_SWIFT
18-
bool AGCompareValues(const void *lhs, const void *rhs, const AGComparisonMode comparisonMode, const void *type);
17+
bool AGCompareValues(const void *lhs, const void *rhs, const void *type, const AGComparisonMode comparisonMode);
1918
AG_EXTERN_C_END
2019

2120
#endif /* AGCompareValues_h */

AG/Sources/Headers/AGCompareValues.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,11 @@
1010

1111
#include "AGBase.h"
1212
#include "AGComparisonMode.h"
13-
#include <stdbool.h>
1413

1514
AG_EXTERN_C_BEGIN
1615
AG_EXPORT
1716
AG_REFINED_FOR_SWIFT
18-
bool AGCompareValues(const void *lhs, const void *rhs, const AGComparisonMode comparisonMode, const void *type);
17+
bool AGCompareValues(const void *lhs, const void *rhs, const void *type, const AGComparisonMode comparisonMode);
1918
AG_EXTERN_C_END
2019

2120
#endif /* AGCompareValues_h */

Sources/OpenGraph/Runtime/CompareValues.swift

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,25 +8,25 @@
88
import _OpenGraph
99

1010
@_silgen_name("OGCompareValues")
11-
@inlinable
12-
@inline(__always)
13-
func OGCompareValues(lhs: UnsafeRawPointer,
14-
rhs: UnsafeRawPointer,
15-
options: OGComparisonOptions,
16-
type: Any.Type) -> Bool
11+
private func OGCompareValues(
12+
lhs: UnsafeRawPointer,
13+
rhs: UnsafeRawPointer,
14+
type: Any.Type,
15+
options: OGComparisonOptions
16+
) -> Bool
1717

1818
public func compareValues<Value>(_ lhs: Value, _ rhs: Value, mode: OGComparisonMode = ._3) -> Bool {
1919
withUnsafePointer(to: lhs) { p1 in
2020
withUnsafePointer(to: rhs) { p2 in
21-
OGCompareValues(lhs: p1, rhs: p2, options: .init(mode: mode), type: Value.self)
21+
OGCompareValues(lhs: p1, rhs: p2, type: Value.self, options: .init(mode: mode))
2222
}
2323
}
2424
}
2525

2626
public func compareValues<Value>(_ lhs: Value, _ rhs: Value, options: OGComparisonOptions) -> Bool {
2727
withUnsafePointer(to: lhs) { p1 in
2828
withUnsafePointer(to: rhs) { p2 in
29-
OGCompareValues(lhs: p1, rhs: p2, options: options, type: Value.self)
29+
OGCompareValues(lhs: p1, rhs: p2, type: Value.self, options: options)
3030
}
3131
}
3232
}

0 commit comments

Comments
 (0)