ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix non newline brackets

Browse Source
This commit is contained in:
Fantasmos 2017-10-31 11:15:38 +11:00
parent 702d7f71c5
commit a094a5a3d6
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/config/user_config.cpp
View File

@ -348,7 +348,8 @@ MapUserConfigParam<T, U>::MapUserConfigParam(const char* param_name,
struct pair_type { T key; U value; }; struct pair_type { T key; U value; };
for (int i = 0; i < nb_elements; i++) { for (int i = 0; i < nb_elements; i++)
{
pair_type key_value_pair = va_arg(arguments, pair_type); pair_type key_value_pair = va_arg(arguments, pair_type);
m_elements.insert(std::pair<T, U>(key_value_pair.key, key_value_pair.value)); m_elements.insert(std::pair<T, U>(key_value_pair.key, key_value_pair.value));
} }
@ -405,7 +406,8 @@ void MapUserConfigParam<T, U>::write(std::ofstream& stream) const
// actual elements // actual elements
//for (int n = 0; n<elts_amount; n++) //for (int n = 0; n<elts_amount; n++)
for (const auto& kv : m_elements) { for (const auto& kv : m_elements)
{
stream << " " << kv.first << "=\"" << kv.second << "\"\n"; stream << " " << kv.first << "=\"" << kv.second << "\"\n";
} }
stream << " >\n"; stream << " >\n";
@ -427,7 +429,8 @@ void MapUserConfigParam<T, U>::findYourDataInAChildOf(const XMLNode* node)
int attr_count = 0; int attr_count = 0;
child->get("Size", &attr_count); child->get("Size", &attr_count);
for (const auto& kv : m_elements) { for (const auto& kv : m_elements)
{
std::pair<T,U> elt; std::pair<T,U> elt;
elt.first = kv.first; elt.first = kv.first;
elt.second = kv.second; elt.second = kv.second;
@ -435,7 +438,8 @@ void MapUserConfigParam<T, U>::findYourDataInAChildOf(const XMLNode* node)
bool there = false; bool there = false;
for (const auto& kvRHS : m_elements) { for (const auto& kvRHS : m_elements)
{
if (elt.second == kvRHS.second) if (elt.second == kvRHS.second)
{ {
there = true; there = true;

3
src/config/user_config.hpp
View File

@ -179,7 +179,8 @@ public:
m_elements = std::map<T,U>(v); m_elements = std::map<T,U>(v);
return m_elements; return m_elements;
} }
U& operator[] (const T key) { U& operator[] (const T key)
{
return m_elements[key]; return m_elements[key];
} }
}; // ListUserConfigParam }; // ListUserConfigParam