@@ -63,14 +63,16 @@ bool JSon::loadJsonFromFile(ifstream &fs, vector<KeyOpFieldsValuesTuple> &db_ite
63
63
return false ;
64
64
}
65
65
66
- db_items.push_back (KeyOpFieldsValuesTuple ());
67
- auto &cur_db_item = db_items[db_items. size () - 1 ] ;
66
+ db_items.emplace_back (KeyOpFieldsValuesTuple ());
67
+ auto &cur_db_item = db_items. back () ;
68
68
69
- for (nlohmann::json::iterator child_it = arr_item.begin (); child_it != arr_item.end (); child_it++) {
69
+ for (auto child_it = arr_item.begin (); child_it != arr_item.end (); child_it++)
70
+ {
70
71
auto cur_obj_key = child_it.key ();
71
72
auto &cur_obj = child_it.value ();
72
73
73
- if (cur_obj.is_object ()) {
74
+ if (cur_obj.is_object ())
75
+ {
74
76
kfvKey (cur_db_item) = cur_obj_key;
75
77
for (nlohmann::json::iterator cur_obj_it = cur_obj.begin (); cur_obj_it != cur_obj.end (); cur_obj_it++)
76
78
{
@@ -80,12 +82,13 @@ bool JSon::loadJsonFromFile(ifstream &fs, vector<KeyOpFieldsValuesTuple> &db_ite
80
82
value_str = to_string ((*cur_obj_it).get <int >());
81
83
else if ((*cur_obj_it).is_string ())
82
84
value_str = (*cur_obj_it).get <string>();
83
- kfvFieldsValues (cur_db_item).push_back (FieldValueTuple (field_str, value_str));
85
+ kfvFieldsValues (cur_db_item).emplace_back (FieldValueTuple (field_str, value_str));
84
86
}
85
87
}
86
88
else
87
89
{
88
90
auto op = cur_obj.get <string>();
91
+
89
92
if (op != " SET" )
90
93
{
91
94
SWSS_LOG_ERROR (" Child elements'op field must be SET, but got %s, ignored" , op.c_str ());
0 commit comments