Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make all headers public and add #ifdef __cplusplus #1150

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Yoga.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,6 @@ Pod::Spec.new do |spec|
'-fPIC'
]
spec.source_files = 'yoga/**/*.{c,h,cpp}'
spec.public_header_files = 'yoga/{Yoga,YGEnums,YGMacros,YGNode,YGStyle,YGValue}.h'
spec.public_header_files = 'yoga/*.h'

end
4 changes: 4 additions & 0 deletions yoga/BitUtils.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@

#pragma once

#ifdef __cplusplus

#include <cstdio>
#include <cstdint>
#include "YGEnums.h"
Expand Down Expand Up @@ -65,3 +67,5 @@ inline void setBooleanData(uint8_t& flags, size_t index, bool value) {
} // namespace detail
} // namespace yoga
} // namespace facebook

#endif
4 changes: 4 additions & 0 deletions yoga/CompactValue.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@

#pragma once

#ifdef __cplusplus

#include "YGValue.h"
#include "YGMacros.h"
#include <cmath>
Expand Down Expand Up @@ -182,3 +184,5 @@ constexpr bool operator!=(CompactValue a, CompactValue b) noexcept {
} // namespace detail
} // namespace yoga
} // namespace facebook

#endif
5 changes: 5 additions & 0 deletions yoga/Utils.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@
*/

#pragma once

#ifdef __cplusplus

#include "YGNode.h"
#include "Yoga-internal.h"
#include "CompactValue.h"
Expand Down Expand Up @@ -145,3 +148,5 @@ inline YGFloatOptional YGResolveValueMargin(
}

void throwLogicalErrorWithMessage(const char* message);

#endif
5 changes: 5 additions & 0 deletions yoga/YGConfig.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@
*/

#pragma once

#ifdef __cplusplus

#include "Yoga-internal.h"
#include "Yoga.h"

Expand Down Expand Up @@ -74,3 +77,5 @@ struct YOGA_EXPORT YGConfig {
setCloneNodeCallback(YGCloneNodeFunc{nullptr});
}
};

#endif
4 changes: 4 additions & 0 deletions yoga/YGFloatOptional.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@

#pragma once

#ifdef __cplusplus

#include <cmath>
#include <limits>
#include "Yoga-internal.h"
Expand Down Expand Up @@ -68,3 +70,5 @@ inline bool operator>=(YGFloatOptional lhs, YGFloatOptional rhs) {
inline bool operator<=(YGFloatOptional lhs, YGFloatOptional rhs) {
return lhs < rhs || lhs == rhs;
}

#endif
5 changes: 5 additions & 0 deletions yoga/YGLayout.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@
*/

#pragma once

#ifdef __cplusplus

#include "BitUtils.h"
#include "YGFloatOptional.h"
#include "Yoga-internal.h"
Expand Down Expand Up @@ -85,3 +88,5 @@ struct YGLayout {
bool operator==(YGLayout layout) const;
bool operator!=(YGLayout layout) const { return !(*this == layout); }
};

#endif
7 changes: 7 additions & 0 deletions yoga/YGNodePrint.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,11 @@
*/

#ifdef DEBUG

#pragma once

#ifdef __cplusplus

#include <string>

#include "Yoga.h"
Expand All @@ -22,4 +26,7 @@ void YGNodeToString(

} // namespace yoga
} // namespace facebook

#endif

#endif
5 changes: 5 additions & 0 deletions yoga/Yoga-internal.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@
*/

#pragma once

#ifdef __cplusplus

#include <algorithm>
#include <array>
#include <cmath>
Expand Down Expand Up @@ -148,3 +151,5 @@ static const float kDefaultFlexShrink = 0.0f;
static const float kWebDefaultFlexShrink = 1.0f;

extern bool YGFloatsEqual(const float a, const float b);

#endif
4 changes: 4 additions & 0 deletions yoga/log.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@

#pragma once

#ifdef __cplusplus

#include "YGEnums.h"

struct YGNode;
Expand Down Expand Up @@ -36,3 +38,5 @@ struct Log {
} // namespace detail
} // namespace yoga
} // namespace facebook

#endif