Skip to content

Commit d8c1609

Browse files
committed
fix potential compilation errors
1 parent 8ce8b8e commit d8c1609

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
cmake_minimum_required(VERSION 3.16.3) # version on Ubuntu Focal
22

3-
project(behaviortree_cpp VERSION 4.7.2 LANGUAGES C CXX)
3+
project(behaviortree_cpp VERSION 4.7.3 LANGUAGES C CXX)
44

55
# create compile_commands.json
66
set(CMAKE_EXPORT_COMPILE_COMMANDS ON)

src/xml_parsing.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ std::string xsdAttributeType(const BT::PortInfo& port_info)
5353
return "blackboardType";
5454
}
5555
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)))
5757
{
5858
return "integerOrBlackboardType";
5959
}
@@ -1444,7 +1444,7 @@ std::string writeTreeXSD(const BehaviorTreeFactory& factory)
14441444
{
14451445
XMLElement* type = doc.NewElement("xs:complexType");
14461446
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) ||
14481448
(model->type == NodeType::SUBTREE))
14491449
{
14501450
/* No children, nothing to add. */
@@ -1478,11 +1478,11 @@ std::string writeTreeXSD(const BehaviorTreeFactory& factory)
14781478
XMLElement* attr = doc.NewElement("xs:attribute");
14791479
attr->SetAttribute("name", port_name.c_str());
14801480
const auto xsd_attribute_type = xsdAttributeType(port_info);
1481-
if(not xsd_attribute_type.empty())
1481+
if(!xsd_attribute_type.empty())
14821482
{
14831483
attr->SetAttribute("type", xsd_attribute_type.c_str());
14841484
}
1485-
if(not port_info.defaultValue().empty())
1485+
if(!port_info.defaultValue().empty())
14861486
{
14871487
attr->SetAttribute("default", port_info.defaultValueString().c_str());
14881488
}

0 commit comments

Comments
 (0)