Try to fix windows builds

ericriff · ericriff · commit 4232154484ac · 2025-09-30T21:40:17.000Z
diff --git a/src/xml_parsing.cpp b/src/xml_parsing.cpp
@@ -53,7 +53,7 @@ std::string xsdAttributeType(const BT::PortInfo& port_info)
     return "blackboardType";
   }
   const auto& type_info = port_info.type();
-  if((type_info == typeid(int)) or (type_info == typeid(unsigned int)))
+  if((type_info == typeid(int)) || (type_info == typeid(unsigned int)))
   {
     return "integerOrBlackboardType";
   }
@@ -1444,7 +1444,7 @@ std::string writeTreeXSD(const BehaviorTreeFactory& factory)
   {
     XMLElement* type = doc.NewElement("xs:complexType");
     type->SetAttribute("name", (model->registration_ID + "Type").c_str());
-    if((model->type == NodeType::ACTION) or (model->type == NodeType::CONDITION) or
+    if((model->type == NodeType::ACTION) || (model->type == NodeType::CONDITION) ||
        (model->type == NodeType::SUBTREE))
     {
       /* No children, nothing to add. */

Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ std::string xsdAttributeType(const BT::PortInfo& port_info)`
`53`	`53`	`return "blackboardType";`
`54`	`54`	`}`
`55`	`55`	`const auto& type_info = port_info.type();`
`56`		`- if((type_info == typeid(int)) or (type_info == typeid(unsigned int)))`
	`56`	`+ if((type_info == typeid(int)) \|\| (type_info == typeid(unsigned int)))`
`57`	`57`	`{`
`58`	`58`	`return "integerOrBlackboardType";`
`59`	`59`	`}`
`@@ -1444,7 +1444,7 @@ std::string writeTreeXSD(const BehaviorTreeFactory& factory)`
`1444`	`1444`	`{`
`1445`	`1445`	`XMLElement* type = doc.NewElement("xs:complexType");`
`1446`	`1446`	`type->SetAttribute("name", (model->registration_ID + "Type").c_str());`
`1447`		`- if((model->type == NodeType::ACTION) or (model->type == NodeType::CONDITION) or`
	`1447`	`+ if((model->type == NodeType::ACTION) \|\| (model->type == NodeType::CONDITION) \|\|`
`1448`	`1448`	`(model->type == NodeType::SUBTREE))`
`1449`	`1449`	`{`
`1450`	`1450`	`/* No children, nothing to add. */`