Compare commits
2 Commits
f7d4b28744
...
2498e7d6e3
| Author | SHA1 | Date | |
|---|---|---|---|
| 2498e7d6e3 | |||
| 3add03dcc0 |
@ -300,6 +300,7 @@ namespace ia
|
||||
{
|
||||
const auto did_reallocate = reserve(newCount);
|
||||
for(; Base::m_count < newCount; Base::m_count++) Base::m_allocator.construct(&Base::m_data[Base::m_count]);
|
||||
Base::m_count = newCount;
|
||||
return did_reallocate;
|
||||
}
|
||||
|
||||
|
||||
@ -203,11 +203,7 @@ namespace ia
|
||||
|
||||
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());
|
||||
>>>>>>> 6c3090f3c6cff06c4f79f28cbc85f43242be4283
|
||||
}
|
||||
|
||||
printf(__CC_DEFAULT "\n");
|
||||
|
||||
@ -22,6 +22,7 @@
|
||||
|
||||
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>;
|
||||
|
||||
#undef VOID
|
||||
|
||||
Reference in New Issue
Block a user