Skip to content

Commit 5ef79b5

Browse files
committed
anoymous namespace
1 parent e12c164 commit 5ef79b5

10 files changed

Lines changed: 80 additions & 10 deletions

‎.clang-tidy‎

Lines changed: 48 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,51 @@
1-
2-
Checks: '-*,bugprone-*,cert-*,clang-analyzer-*,concurrency-*,cppcoreguidelines-*,misc-*,modernize-*,performance-*,portability-*,readability-*,-modernize-use-trailing-return-type,-readability-identifier-length,-cppcoreguidelines-avoid-magic-numbers,-cppcoreguidelines-pro-bounds-constant-array-index,-cppcoreguidelines-pro-bounds-pointer-arithmetic,-readability-magic-numbers,-bugprone-easily-swappable-parameters,-performance-avoid-endl,-cert-err58-cpp,-modernize-use-emplace,-misc-no-recursion,-misc-include-cleaner,-misc-use-internal-linkage,-cppcoreguidelines-pro-type-union-access,-cppcoreguidelines-noexcept-move-operations,-performance-noexcept-move-constructor,-cppcoreguidelines-pro-bounds-array-to-pointer-decay,-bugprone-exception-escape,-cert-oop54-cpp,-modernize-use-designated-initializers,-cppcoreguidelines-prefer-member-initializer,-cppcoreguidelines-macro-usage,-cppcoreguidelines-avoid-c-arrays,-modernize-avoid-c-arrays,-cppcoreguidelines-owning-memory,-cppcoreguidelines-pro-type-const-cast,-cppcoreguidelines-special-member-functions,-cppcoreguidelines-avoid-non-const-global-variables,-cppcoreguidelines-avoid-const-or-ref-data-members,-bugprone-branch-clone,-cppcoreguidelines-pro-type-member-init,-cert-err33-c,-bugprone-narrowing-conversions,-cppcoreguidelines-narrowing-conversions,-clang-analyzer-optin.cplusplus.VirtualCall,-cppcoreguidelines-use-default-member-init,-modernize-use-default-member-init,-cppcoreguidelines-init-variables,-cert-msc32-c,-cert-msc51-cpp,-bugprone-reserved-identifier,-cert-dcl37-c,-cert-dcl51-cpp,-cppcoreguidelines-pro-type-vararg'
1+
Checks: [
2+
"-*",
3+
"bugprone-*",
4+
"cert-*",
5+
"clang-analyzer-*",
6+
"concurrency-*",
7+
"cppcoreguidelines-*",
8+
"misc-*",
9+
"modernize-*",
10+
"performance-*",
11+
"portability-*",
12+
"readability-*",
13+
"-bugprone-branch-clone",
14+
"-bugprone-easily-swappable-parameters",
15+
"-bugprone-narrowing-conversions",
16+
"-cert-err33-c",
17+
"-cert-err58-cpp",
18+
"-cert-oop54-cpp",
19+
"-clang-analyzer-optin.cplusplus.VirtualCall",
20+
"-cppcoreguidelines-avoid-c-arrays",
21+
"-cppcoreguidelines-avoid-const-or-ref-data-members",
22+
"-cppcoreguidelines-avoid-magic-numbers",
23+
"-cppcoreguidelines-avoid-non-const-global-variables",
24+
"-cppcoreguidelines-init-variables",
25+
"-cppcoreguidelines-macro-usage",
26+
"-cppcoreguidelines-narrowing-conversions",
27+
"-cppcoreguidelines-noexcept-move-operations",
28+
"-cppcoreguidelines-owning-memory",
29+
"-cppcoreguidelines-prefer-member-initializer",
30+
"-cppcoreguidelines-pro-bounds-array-to-pointer-decay",
31+
"-cppcoreguidelines-pro-bounds-constant-array-index",
32+
"-cppcoreguidelines-pro-bounds-pointer-arithmetic",
33+
"-cppcoreguidelines-pro-type-const-cast",
34+
"-cppcoreguidelines-pro-type-member-init",
35+
"-cppcoreguidelines-pro-type-union-access",
36+
"-cppcoreguidelines-pro-type-vararg",
37+
"-cppcoreguidelines-special-member-functions",
38+
"-cppcoreguidelines-use-default-member-init",
39+
"-misc-no-recursion",
40+
"-modernize-avoid-c-arrays",
41+
"-modernize-use-default-member-init",
42+
"-modernize-use-designated-initializers",
43+
"-modernize-use-emplace",
44+
"-performance-avoid-const-params",
45+
"-performance-avoid-endl",
46+
"-performance-noexcept-move-constructor",
47+
"-readability-magic-numbers"
48+
]
349

450

551
WarningsAsErrors: '-*,bugprone-*,cert-*,clang-analyzer-*,concurrency-*,cppcoreguidelines-*,misc-*,portability-*,readability-implicit-bool-conversion,-concurrency-mt-unsafe,-readability-function-cognitive-complexity'

‎run_clang_tidy.sh‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ fi
3131

3232
clang_tidy_paths="$ws_dir/src $ws_dir/include"
3333
cmake_build_path="$ws_dir/${1:-build}"
34-
log_file="$ws_dir/clang_tidy_output.log"
3534

3635
skip_list=(
3736
"$ws_dir/3rdparty"
@@ -51,11 +50,6 @@ if [ ! -f "$cmake_build_path/compile_commands.json" ]; then
5150
exit 1
5251
fi
5352

54-
# clear the log file
55-
if [ -f "$log_file" ]; then
56-
rm "$log_file"
57-
fi
58-
5953
echo "-----------------------------------------------------------"
6054
echo "Running clang-tidy on $clang_tidy_paths"
6155
echo " Skipping paths:"
@@ -74,9 +68,9 @@ find $clang_tidy_paths \( -name '*.cpp' -o -name '*.hpp' \) -not -name '*_WIN.cp
7468
--compile-commands-dir="'"$cmake_build_path"'" \
7569
--check-locations=false \
7670
--check="$@" \
77-
2>&1 | sed "s/^/${1//\//\\/}: /" | tee -a '"$log_file"'
71+
2>&1 | sed "s/^/${1//\//\\/}: /"
7872
' _
7973

8074
echo "-----------------------------------------------------------"
81-
echo "Clang-tidy complete. Log saved to $log_file"
75+
echo "Clang-tidy complete."
8276
echo "-----------------------------------------------------------"

‎src/action_node.cpp‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,10 +71,13 @@ struct CoroActionNode::Pimpl
7171
mco_desc desc = {};
7272
};
7373

74+
namespace
75+
{
7476
void CoroEntry(mco_coro* co)
7577
{
7678
static_cast<CoroActionNode*>(co->user_data)->tickImpl();
7779
}
80+
} // namespace
7881

7982
CoroActionNode::CoroActionNode(const std::string& name, const NodeConfig& config)
8083
: ActionNodeBase(name, config), _p(new Pimpl)

‎src/basic_types.cpp‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,8 @@ uint64_t convertFromString<uint64_t>(StringView str)
140140
return result;
141141
}
142142

143+
namespace
144+
{
143145
template <typename T>
144146
T ConvertWithBoundCheck(StringView str)
145147
{
@@ -151,6 +153,7 @@ T ConvertWithBoundCheck(StringView str)
151153
}
152154
return res;
153155
}
156+
} // namespace
154157

155158
template <>
156159
int8_t convertFromString<int8_t>(StringView str)

‎src/behavior_tree.cpp‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,8 @@ void printTreeRecursively(const TreeNode* root_node, std::ostream& stream)
9898
stream << "----------------" << std::endl;
9999
}
100100

101+
namespace
102+
{
101103
void buildSerializedStatusSnapshot(TreeNode* root_node,
102104
SerializedTreeStatus& serialized_buffer)
103105
{
@@ -110,6 +112,7 @@ void buildSerializedStatusSnapshot(TreeNode* root_node,
110112

111113
applyRecursiveVisitor(root_node, visitor);
112114
}
115+
} // namespace
113116

114117
int LibraryVersionNumber()
115118
{

‎src/blackboard.cpp‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,13 @@
66
namespace BT
77
{
88

9+
namespace
10+
{
911
bool IsPrivateKey(StringView str)
1012
{
1113
return str.size() >= 1 && str.data()[0] == '_';
1214
}
15+
} // namespace
1316

1417
void Blackboard::enableAutoRemapping(bool remapping)
1518
{

‎src/loggers/bt_file_logger_v2.cpp‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,13 @@
55
namespace BT
66
{
77

8+
namespace
9+
{
810
int64_t ToUsec(Duration ts)
911
{
1012
return std::chrono::duration_cast<std::chrono::microseconds>(ts).count();
1113
}
14+
} // namespace
1215

1316
struct FileLogger2::PImpl
1417
{

‎src/loggers/bt_minitrace_logger.cpp‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ MinitraceLogger::~MinitraceLogger()
2121
mtr_shutdown();
2222
}
2323

24+
namespace
25+
{
2426
const char* toConstStr(NodeType type)
2527
{
2628
switch(type)
@@ -39,6 +41,7 @@ const char* toConstStr(NodeType type)
3941
return "Undefined";
4042
}
4143
}
44+
} // namespace
4245

4346
void MinitraceLogger::callback(Duration /*timestamp*/, const TreeNode& node,
4447
NodeStatus prev_status, NodeStatus status)

‎src/loggers/groot2_publisher.cpp‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@ struct Transition
3030
uint8_t padding[5];
3131
};
3232

33+
namespace
34+
{
3335
std::array<char, 16> CreateRandomUUID()
3436
{
3537
std::mt19937 gen;
@@ -51,6 +53,7 @@ std::array<char, 16> CreateRandomUUID()
5153

5254
return out;
5355
}
56+
} // namespace
5457

5558
struct Groot2Publisher::PImpl
5659
{

‎src/xml_parsing.cpp‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,9 +86,12 @@ namespace BT
8686
{
8787
using namespace tinyxml2;
8888

89+
namespace
90+
{
8991
auto StrEqual = [](const char* str1, const char* str2) -> bool {
9092
return strcmp(str1, str2) == 0;
9193
};
94+
} // namespace
9295

9396
struct SubtreeModel
9497
{
@@ -1063,6 +1066,8 @@ void XMLParser::PImpl::getPortsRecursively(const XMLElement* element,
10631066
}
10641067
}
10651068

1069+
namespace
1070+
{
10661071
void addNodeModelToXML(const TreeNodeManifest& model, XMLDocument& doc,
10671072
XMLElement* model_root)
10681073
{
@@ -1214,6 +1219,7 @@ void addTreeToXML(const Tree& tree, XMLDocument& doc, XMLElement* rootXML,
12141219
addNodeModelToXML(*model, doc, model_root);
12151220
}
12161221
}
1222+
} // namespace
12171223

12181224
std::string writeTreeNodesModelXML(const BehaviorTreeFactory& factory,
12191225
bool include_builtin)
@@ -1518,6 +1524,8 @@ std::string writeTreeXSD(const BehaviorTreeFactory& factory)
15181524
return std::string(printer.CStr(), size_t(printer.CStrSize() - 1));
15191525
}
15201526

1527+
namespace
1528+
{
15211529
Tree buildTreeFromText(const BehaviorTreeFactory& factory, const std::string& text,
15221530
const Blackboard::Ptr& blackboard)
15231531
{
@@ -1533,6 +1541,7 @@ Tree buildTreeFromFile(const BehaviorTreeFactory& factory, const std::string& fi
15331541
parser.loadFromFile(filename);
15341542
return parser.instantiateTree(blackboard);
15351543
}
1544+
} // namespace
15361545

15371546
std::string WriteTreeToXML(const Tree& tree, bool add_metadata, bool add_builtin_models)
15381547
{

0 commit comments

Comments
 (0)