From 7d5696d1a9f0776f51ec20e81a413fcdcc748c4e Mon Sep 17 00:00:00 2001 From: Giacomo Travaglini Date: Tue, 8 Jan 2019 10:17:39 +0000 Subject: base: Make it possible to convert strings to enums The __to_number helper function defined in base/str.hh is used by unserializing code. Its purpose is to convert a string into an integral/floating point number. Since enums underlying type can only be an integer type, it makes sense to extend the helper function for enums as well. In this way it will be possible to unserialize Enums and containers of Enums without the need of casting. Change-Id: I74069cc4c04ec8b5eb80939acea7ab18fb366dd4 Signed-off-by: Giacomo Travaglini Reviewed-by: Ciro Santilli Reviewed-by: Andreas Sandberg Reviewed-by: Nikos Nikoleris Reviewed-on: https://gem5-review.googlesource.com/c/15336 Reviewed-by: Gabe Black Maintainer: Andreas Sandberg --- src/base/str.hh | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/base/str.hh b/src/base/str.hh index 52ab977fc..61022bd26 100644 --- a/src/base/str.hh +++ b/src/base/str.hh @@ -1,4 +1,7 @@ /* + * Copyright (c) 2018 ARM Limited + * All rights reserved + * * Copyright (c) 2001-2005 The Regents of The University of Michigan * All rights reserved. * @@ -102,10 +105,11 @@ tokenize(std::vector &vector, const std::string &s, * @{ * * @name String to number helper functions for signed and unsigned - * integeral type, as well as floating-point types. + * integeral type, as well as enums and floating-point types. */ template -typename std::enable_if::value && +typename std::enable_if<(std::is_integral::value || + std::is_enum::value) && std::is_signed::value, T>::type __to_number(const std::string &value) { @@ -117,7 +121,8 @@ __to_number(const std::string &value) } template -typename std::enable_if::value && +typename std::enable_if<(std::is_integral::value || + std::is_enum::value) && !std::is_signed::value, T>::type __to_number(const std::string &value) { -- cgit v1.2.3