dev0/IACore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes

Browse Source
This commit is contained in:
Isuru Samarathunga
2025-10-31 11:16:30 +05:30
parent f7d4b28744
commit 3add03dcc0
2 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Src/IACore/inc/hpp/IACore/CLI.hpp
View File

@ -203,11 +203,7 @@ namespace ia
for (const auto &v : t->Value.Switches) for (const auto &v : t->Value.Switches)
{ {
<<<<<<< HEAD
printf(__CC_WHITE "\t/%s %s\n", v.ID.c_str(), v.Help.c_str());
=======
printf(__CC_WHITE "//%s %s\n", v.ID.c_str(), v.Help.c_str()); printf(__CC_WHITE "//%s %s\n", v.ID.c_str(), v.Help.c_str());
>>>>>>> 6c3090f3c6cff06c4f79f28cbc85f43242be4283
} }
printf(__CC_DEFAULT "\n"); printf(__CC_DEFAULT "\n");

1
Src/IACore/inc/hpp/IACore/Types.hpp
View File

@ -22,6 +22,7 @@
namespace ia namespace ia
{ {
template<typename _value_type> using InitializerList = std::initializer_list<_value_type>;
template<typename _value_type> using initializer_list = std::initializer_list<_value_type>; template<typename _value_type> using initializer_list = std::initializer_list<_value_type>;
#undef VOID #undef VOID