From 25b333862cd945d1b648af9bc4a5932927ebc1d2 Mon Sep 17 00:00:00 2001
From: Jens Frenkel <jens.frenkel@tu-dresden.de>
Date: Mon, 2 May 2011 06:53:39 +0000
Subject: [PATCH] - use derivativeNamePrefix from DAE - use function
 ComponentReference.crefPrefixDer

git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@8767 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
---
 Compiler/BackEnd/BackendDAE.mo     | 2 +-
 Compiler/BackEnd/BackendDAEUtil.mo | 2 +-
 Compiler/BackEnd/Derive.mo         | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Compiler/BackEnd/BackendDAE.mo b/Compiler/BackEnd/BackendDAE.mo
index ddc09116ed2..3264e6cb985 100644
--- a/Compiler/BackEnd/BackendDAE.mo
+++ b/Compiler/BackEnd/BackendDAE.mo
@@ -44,7 +44,7 @@ public import Values;
 public import HashTable2;
 public import HashTable4;
 
-public constant String derivativeNamePrefix="$DER";
+public constant String derivativeNamePrefix=DAE.derivativeNamePrefix;
 public constant String partialDerivativeNamePrefix="$pDER";
 
 public uniontype Type "
diff --git a/Compiler/BackEnd/BackendDAEUtil.mo b/Compiler/BackEnd/BackendDAEUtil.mo
index d514d68b63e..61dc9455c0b 100644
--- a/Compiler/BackEnd/BackendDAEUtil.mo
+++ b/Compiler/BackEnd/BackendDAEUtil.mo
@@ -4144,7 +4144,7 @@ algorithm
     
     case (((e as DAE.CALL(path = Absyn.IDENT(name = "der"),expLst = {DAE.CREF(componentRef = cr)}),(vars,pa))))
       equation
-        cr = ComponentReference.makeCrefQual("$DER", DAE.ET_REAL(), {}, cr);
+        cr = ComponentReference.crefPrefixDer(cr);
         (varslst,p) = BackendVariable.getVar(cr, vars);
         res = incidenceRowExp1(varslst,p,pa,false);
       then
diff --git a/Compiler/BackEnd/Derive.mo b/Compiler/BackEnd/Derive.mo
index c7a89ba00eb..103ec57a6ed 100644
--- a/Compiler/BackEnd/Derive.mo
+++ b/Compiler/BackEnd/Derive.mo
@@ -1373,7 +1373,7 @@ algorithm
     
     case (DAE.CALL(path = Absyn.IDENT("der"), expLst = {DAE.CREF(componentRef = cr)}), crx, differentiateIfExp)
       equation
-        cr = ComponentReference.makeCrefQual("$DER", DAE.ET_REAL(), {}, cr);
+        cr = ComponentReference.crefPrefixDer(cr);
         true = ComponentReference.crefEqual(cr, crx);
         rval = intReal(1);
       then