Fix macOS build, _Nullable is reserved keyword

feature/hunter
Nimetu 3 years ago
parent ee219b7e5e
commit a356abdd7c

@ -97,7 +97,7 @@ public:
_Property = 0; _Property = 0;
_oldProperty = 0; _oldProperty = 0;
_Type = UNKNOWN; _Type = UNKNOWN;
_Nullable = false; m_Nullable = false;
_Changed = false; _Changed = false;
_LastChangeGC = 0; _LastChangeGC = 0;
} }
@ -238,7 +238,7 @@ private:
EPropType _Type; EPropType _Type;
/// nullable /// nullable
bool _Nullable; bool m_Nullable;
/// true if this value has changed /// true if this value has changed
bool _Changed; bool _Changed;

@ -55,11 +55,11 @@ void CCDBNodeLeaf::init( xmlNodePtr node, IProgressCallback &/* progressCallBac
CXMLAutoPtr nullable((const char*)xmlGetProp (node, (xmlChar*)"nullable")); CXMLAutoPtr nullable((const char*)xmlGetProp (node, (xmlChar*)"nullable"));
if ((const char *) nullable != NULL) if ((const char *) nullable != NULL)
{ {
_Nullable = (nullable.getDatas()[0] == '1'); m_Nullable = (nullable.getDatas()[0] == '1');
} }
else else
{ {
_Nullable = false; m_Nullable = false;
} }
// Read type // Read type
@ -167,7 +167,7 @@ void CCDBNodeLeaf::readDelta(TGameCycle gc, CBitMemStream & f )
uint64 recvd = 0; uint64 recvd = 0;
uint64 isNull = 0; uint64 isNull = 0;
if (_Nullable) if (m_Nullable)
{ {
f.serial(isNull, 1); f.serial(isNull, 1);
} }

Loading…
Cancel
Save