diff options
| author | Murray Cumming <murrayc@murrayc.com> | 2017-05-07 21:37:33 +0200 |
|---|---|---|
| committer | Murray Cumming <murrayc@murrayc.com> | 2017-05-07 21:37:33 +0200 |
| commit | 89985b02440d2ff661b636d57bfdb25a352db4fd (patch) | |
| tree | f810ea1039e975a8666d3857cd544f4aaf0ea798 /tools | |
| parent | c88fa83e0304f91d9aef320abd65d45c4fb6b963 (diff) | |
| download | glibmm-89985b02440d2ff661b636d57bfdb25a352db4fd.tar.gz | |
convert_base.m4: More use of static_cast<>.
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/m4/convert_base.m4 | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/tools/m4/convert_base.m4 b/tools/m4/convert_base.m4 index b7657586..da5137c4 100644 --- a/tools/m4/convert_base.m4 +++ b/tools/m4/convert_base.m4 @@ -66,12 +66,12 @@ popdef(`C_ENUM_NAME') # Specify C_enum_name, if it's not the concatenation of namespace+class_name+enum_name. define(`_CONV_INCLASS_ENUM',`dnl pushdef(`C_ENUM_NAME', `m4_ifelse(`$4',,`$1$2$3',`$4')') -_CONVERSION(`C_ENUM_NAME', `$3', (($3)(__ARG3__))) -_CONVERSION(`C_ENUM_NAME', `$2::$3', (($2::$3)(__ARG3__))) -_CONVERSION(`C_ENUM_NAME', `$1::$2::$3', (($1::$2::$3)(__ARG3__))) -_CONVERSION(`$3', `C_ENUM_NAME', ((C_ENUM_NAME)(__ARG3__))) -_CONVERSION(`$2::$3', `C_ENUM_NAME', ((C_ENUM_NAME)(__ARG3__))) -_CONVERSION(`$1::$2::$3', `C_ENUM_NAME', ((C_ENUM_NAME)(__ARG3__))) +_CONVERSION(`C_ENUM_NAME', `$3', static_cast<$3>(__ARG3__)) +_CONVERSION(`C_ENUM_NAME', `$2::$3', static_cast<$2::$3>(__ARG3__)) +_CONVERSION(`C_ENUM_NAME', `$1::$2::$3', static_cast<$1::$2::$3>(__ARG3__)) +_CONVERSION(`$3', `C_ENUM_NAME', static_cast<C_ENUM_NAME>(__ARG3__)) +_CONVERSION(`$2::$3', `C_ENUM_NAME', static_cast<C_ENUM_NAME>(__ARG3__)) +_CONVERSION(`$1::$2::$3', `C_ENUM_NAME', static_cast<C_ENUM_NAME>(__ARG3__)) popdef(`C_ENUM_NAME') ')dnl |