From: eap <eap@opencascade.com>
Date: Fri, 19 Mar 2021 10:55:45 +0000 (+0300)
Subject: bos #20256: avoid clash with FromIdType() from MEDCOUPLING
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=227ecdee84e759895e7df6fb65ed3f3721bc663e;p=modules%2Fkernel.git

bos #20256: avoid clash with FromIdType() from MEDCOUPLING
---

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 <class T> inline smIdType ToIdType(T val)
+template <class T> inline smIdType ToSmIdType(T val)
 {
   return static_cast<smIdType>(val);
 }
-template <class T> inline T FromIdType(smIdType val)
+template <class T> inline T FromSmIdType(smIdType val)
 {
   return static_cast<T>(val);
 }