Skip to content

Commit f8091fa

Browse files
gmondadagrabbou
authored andcommitted
fix use of C++ syntax in an header file
Summary: All public header files can be included from Obj-C and Swift, except RCTSurfaceSizeMeasureMode.h which contains C++ code. Change is trivial and can be validated by review. None. [IOS][BUGFIX][{RCTSurfaceSizeMeasureMode.h}] - fix use of C++ syntax in an header file that could be included from Obj-C and Swift Closes facebook#18730 Differential Revision: D7550290 Pulled By: shergin fbshipit-source-id: 3835e2c57697a067ff94afdaeaca06bce132ef66
1 parent e187b07 commit f8091fa

File tree

3 files changed

+16
-16
lines changed

3 files changed

+16
-16
lines changed

React/Base/Surface/SurfaceHostingView/RCTSurfaceHostingView.mm

+4-4
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,8 @@ - (void)setFrame:(CGRect)frame
7373
RCTSurfaceMinimumSizeAndMaximumSizeFromSizeAndSizeMeasureMode(
7474
self.bounds.size,
7575
_sizeMeasureMode,
76-
minimumSize,
77-
maximumSize
76+
&minimumSize,
77+
&maximumSize
7878
);
7979

8080
[_surface setMinimumSize:minimumSize
@@ -110,8 +110,8 @@ - (CGSize)sizeThatFits:(CGSize)size
110110
RCTSurfaceMinimumSizeAndMaximumSizeFromSizeAndSizeMeasureMode(
111111
size,
112112
_sizeMeasureMode,
113-
minimumSize,
114-
maximumSize
113+
&minimumSize,
114+
&maximumSize
115115
);
116116

117117
return [_surface sizeThatFitsMinimumSize:minimumSize

React/Base/Surface/SurfaceHostingView/RCTSurfaceSizeMeasureMode.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,6 @@ typedef NS_OPTIONS(NSInteger, RCTSurfaceSizeMeasureMode) {
2828
RCT_EXTERN void RCTSurfaceMinimumSizeAndMaximumSizeFromSizeAndSizeMeasureMode(
2929
CGSize size,
3030
RCTSurfaceSizeMeasureMode sizeMeasureMode,
31-
CGSize &minimumSize,
32-
CGSize &maximumSize
31+
CGSize *minimumSize,
32+
CGSize *maximumSize
3333
);

React/Base/Surface/SurfaceHostingView/RCTSurfaceSizeMeasureMode.mm

+10-10
Original file line numberDiff line numberDiff line change
@@ -12,25 +12,25 @@
1212
void RCTSurfaceMinimumSizeAndMaximumSizeFromSizeAndSizeMeasureMode(
1313
CGSize size,
1414
RCTSurfaceSizeMeasureMode sizeMeasureMode,
15-
CGSize &minimumSize,
16-
CGSize &maximumSize
15+
CGSize *minimumSize,
16+
CGSize *maximumSize
1717
) {
18-
minimumSize = CGSizeZero;
19-
maximumSize = CGSizeMake(CGFLOAT_MAX, CGFLOAT_MAX);
18+
*minimumSize = CGSizeZero;
19+
*maximumSize = CGSizeMake(CGFLOAT_MAX, CGFLOAT_MAX);
2020

2121
if (sizeMeasureMode & RCTSurfaceSizeMeasureModeWidthExact) {
22-
minimumSize.width = size.width;
23-
maximumSize.width = size.width;
22+
minimumSize->width = size.width;
23+
maximumSize->width = size.width;
2424
}
2525
else if (sizeMeasureMode & RCTSurfaceSizeMeasureModeWidthAtMost) {
26-
maximumSize.width = size.width;
26+
maximumSize->width = size.width;
2727
}
2828

2929
if (sizeMeasureMode & RCTSurfaceSizeMeasureModeHeightExact) {
30-
minimumSize.height = size.height;
31-
maximumSize.height = size.height;
30+
minimumSize->height = size.height;
31+
maximumSize->height = size.height;
3232
}
3333
else if (sizeMeasureMode & RCTSurfaceSizeMeasureModeHeightAtMost) {
34-
maximumSize.height = size.height;
34+
maximumSize->height = size.height;
3535
}
3636
}

0 commit comments

Comments
 (0)