From 1041771367cf64c62869d888d8587e71eaba645a Mon Sep 17 00:00:00 2001 From: "jussi.koskela" Date: Wed, 3 Dec 2014 14:46:07 +0000 Subject: [PATCH] (fixes #5528) Name collision: getType SCL function git-svn-id: https://www.simantics.org/svn/simantics/sysdyn/trunk@30636 ac1ea38d-2e2b-0410-8846-a27921b304fc --- org.simantics.sysdyn/scl/Simantics/Sysdyn.scl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/org.simantics.sysdyn/scl/Simantics/Sysdyn.scl b/org.simantics.sysdyn/scl/Simantics/Sysdyn.scl index 878dffb5..c0b0eb36 100644 --- a/org.simantics.sysdyn/scl/Simantics/Sysdyn.scl +++ b/org.simantics.sysdyn/scl/Simantics/Sysdyn.scl @@ -31,8 +31,9 @@ importJava "org.simantics.sysdyn.utils.DocumentationUtils" where @JavaName getName getName :: Resource -> String + // Renamed getType -> getElementType due to name collision @JavaName getType - getType :: Resource -> String + getElementType :: Resource -> String @JavaName getUnit getUnit :: Resource -> String -- 2.47.1