Simplify construction of tuples
The latest version of GCC flags an error on this code, where string
length isn't initialized in some cases, and prints several pages of
template and compiler errors.
This commit simplifies the code such that rather than constructing a
tuple, moving it to a stack variable, then moving it into the vector,
simply constructs the tuple in the vector in the first place. This
avoids an undefined behavior warning of use after free on the tuple
variable.
Tested: Code compiles.
Signed-off-by: Ed Tanous <edtanous@google.com>
Change-Id: I4d8424f452a98e558607527abd3ec9cf7f4460d1
diff --git a/snmp_notification.hpp b/snmp_notification.hpp
index 5f2bf69..374af97 100644
--- a/snmp_notification.hpp
+++ b/snmp_notification.hpp
@@ -194,33 +194,23 @@
OID_LEN idLen = 11;
OID id = {1, 3, 6, 1, 4, 1, 49871, 1, 0, 1, 1};
auto type = getASNType<decltype(OBMCErrorID)>();
- auto tuple =
- std::tuple<OID, OID_LEN, Type, Value>(id, idLen, type, OBMCErrorID);
- objectList.emplace_back(std::move(tuple));
+ objectList.emplace_back(id, idLen, type, OBMCErrorID);
id = {1, 3, 6, 1, 4, 1, 49871, 1, 0, 1, 2};
type = getASNType<decltype(OBMCErrorTimestamp)>();
- tuple = std::tuple<OID, OID_LEN, Type, Value>(id, idLen, type,
- OBMCErrorTimestamp);
- objectList.emplace_back(std::move(tuple));
+ objectList.emplace_back(id, idLen, type, OBMCErrorTimestamp);
id = {1, 3, 6, 1, 4, 1, 49871, 1, 0, 1, 3};
type = getASNType<decltype(OBMCErrorSeverity)>();
- tuple = std::tuple<OID, OID_LEN, Type, Value>(id, idLen, type,
- OBMCErrorSeverity);
-
- objectList.emplace_back(std::move(tuple));
+ objectList.emplace_back(id, idLen, type, OBMCErrorSeverity);
id = {1, 3, 6, 1, 4, 1, 49871, 1, 0, 1, 4};
type = getASNType<decltype(OBMCErrorMessage)>();
- tuple = std::tuple<OID, OID_LEN, Type, Value>(id, idLen, type,
- OBMCErrorMessage);
-
- objectList.emplace_back(std::move(tuple));
+ objectList.emplace_back(id, idLen, type, OBMCErrorMessage);
return objectList;
}