Skip to content

Commit c46bb60

Browse files
committed
Fix conflict with ObjectiveC nil
1 parent e32d95d commit c46bb60

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

Sources/OpenGraph_SPI/Attribute/AttributeID.hpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ class AttributeID final {
2222
enum class Kind: uint8_t {
2323
Direct = 0x0,
2424
Indirect = 0x1,
25-
Nil = 0x2,
25+
Null = 0x2,
2626
};
2727
private:
2828
uint32_t _rawValue;
@@ -59,8 +59,8 @@ class AttributeID final {
5959
}
6060

6161
OG_INLINE OG_CONSTEXPR
62-
const bool isNil() const OG_NOEXCEPT {
63-
return getKind() == Kind::Nil;
62+
const bool isNull() const OG_NOEXCEPT {
63+
return getKind() == Kind::Null;
6464
}
6565

6666
OG_INLINE OG_CONSTEXPR

Sources/OpenGraph_SPI/Attribute/OGAttribute.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
#include "../Util/assert.hpp"
1212
#include <optional>
1313

14-
const OGAttribute OGAttributeNil = OGAttribute(OG::AttributeID::Kind::Nil);
14+
const OGAttribute OGAttributeNil = OGAttribute(OG::AttributeID::Kind::Null);
1515

1616
OGAttribute OGGraphGetCurrentAttribute() {
1717
// TODO

0 commit comments

Comments
 (0)