Skip to content

Commit 4aee376

Browse files
authored
Merge pull request #252 from heoblitz/feature/update_yoga_3.0.4
Update yoga 3.0.4
2 parents ad20f28 + 65a2e86 commit 4aee376

File tree

95 files changed

+9392
-7551
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

95 files changed

+9392
-7551
lines changed

FlexLayout.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ Pod::Spec.new do |spec|
1919
'-fexceptions',
2020
'-Wall',
2121
'-Werror',
22-
'-std=c++1y',
22+
'-std=c++20',
2323
'-fPIC'
2424
]
2525
end

FlexLayout.xcodeproj/project.pbxproj

Lines changed: 320 additions & 120 deletions
Large diffs are not rendered by default.

Package.swift

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,5 @@ let package = Package(
3434
]
3535
),
3636
],
37-
cLanguageStandard: .gnu99,
38-
cxxLanguageStandard: .gnucxx11
37+
cxxLanguageStandard: CXXLanguageStandard(rawValue: "c++20")
3938
)

Podfile.lock

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
PODS:
2-
- FlexLayout (2.0.05)
2+
- FlexLayout (2.0.07)
33
- PinLayout (1.10.5)
44
- SwiftLint (0.54.0)
55

@@ -18,7 +18,7 @@ EXTERNAL SOURCES:
1818
:path: "./"
1919

2020
SPEC CHECKSUMS:
21-
FlexLayout: 1cdf0b71a0d06669a497c5a80a355e76129a1025
21+
FlexLayout: 154a56a77c623050eb3a503cacfd6d71d1bb58b0
2222
PinLayout: f6c2b63a5a5b24864064e1d15c67de41b4e74748
2323
SwiftLint: c1de071d9d08c8aba837545f6254315bc900e211
2424

Sources/YogaKit/YGLayout.mm

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -365,7 +365,7 @@ - (CGSize)calculateLayoutWithSize:(CGSize)size {
365365
#pragma mark - Private
366366

367367
static float YGMeasureBaselineLabel(
368-
YGNodeRef node,
368+
YGNodeConstRef node,
369369
const float width,
370370
const float height) {
371371

@@ -374,7 +374,7 @@ static float YGMeasureBaselineLabel(
374374
}
375375

376376
static float YGMeasureBaselineTextView(
377-
YGNodeRef node,
377+
YGNodeConstRef node,
378378
const float width,
379379
const float height) {
380380

@@ -383,7 +383,7 @@ static float YGMeasureBaselineTextView(
383383
}
384384

385385
static float YGMeasureBaselineTextField(
386-
YGNodeRef node,
386+
YGNodeConstRef node,
387387
const float width,
388388
const float height) {
389389

@@ -401,7 +401,7 @@ static float YGMeasureBaselineTextField(
401401
}
402402

403403
static YGSize YGMeasureView(
404-
YGNodeRef node,
404+
YGNodeConstRef node,
405405
float width,
406406
YGMeasureMode widthMode,
407407
float height,

0 commit comments

Comments
 (0)