From 227ecdee84e759895e7df6fb65ed3f3721bc663e Mon Sep 17 00:00:00 2001 From: eap Date: Fri, 19 Mar 2021 13:55:45 +0300 Subject: [PATCH] bos #20256: avoid clash with FromIdType() from MEDCOUPLING --- src/Basics/smIdType.hxx.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Basics/smIdType.hxx.in b/src/Basics/smIdType.hxx.in index 9f87b9fe6..73e38f3c3 100644 --- a/src/Basics/smIdType.hxx.in +++ b/src/Basics/smIdType.hxx.in @@ -47,11 +47,11 @@ struct smIdHasher } }; -template inline smIdType ToIdType(T val) +template inline smIdType ToSmIdType(T val) { return static_cast(val); } -template inline T FromIdType(smIdType val) +template inline T FromSmIdType(smIdType val) { return static_cast(val); } -- 2.39.2